diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 23:45:44 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 06:53:03 -0600 |
| commit | 2ef9df8aee696993d9eb235fd36caa4cbcfd3624 (patch) | |
| tree | 7b9a351a3362f45a909299c93192bd11a2fd0c4e /sd/source/ui | |
| parent | 7e92d9881f039899262882633712ec0a3de01474 (diff) | |
Remove visual noise from sd
Change-Id: I0957cabd66ddc4e25c7e6ff54ec2a555eda0792c
Reviewed-on: https://gerrit.libreoffice.org/8306
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd/source/ui')
67 files changed, 461 insertions, 698 deletions
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx index 153d7c0dd4e4..dcd4cf36830b 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx @@ -32,7 +32,7 @@ class HelpButton; namespace sd { -// -------------------------------------------------------------------- + class CustomAnimationCreateTabPage; class CustomAnimationPane; diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 3c27cf8ba5ec..bb425853248a 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -99,7 +99,7 @@ extern void fillDurationComboBox( ListBox* pBox ); extern OUString getShapeDescription( const Reference< XShape >& xShape, bool bWithText = true ); extern OUString getPropertyName( sal_Int32 nPropertyType ); -// ==================================================================== + class PresetPropertyBox : public PropertySubControl { @@ -186,7 +186,7 @@ Control* PresetPropertyBox::getControl() return mpControl; } -// ==================================================================== + class ColorPropertyBox : public PropertySubControl { @@ -270,7 +270,7 @@ Control* ColorPropertyBox::getControl() return mpControl; } -// ==================================================================== + class FontPropertyBox : public PropertySubControl { @@ -355,7 +355,7 @@ Control* FontPropertyBox::getControl() return mpControl; } -// ==================================================================== + class DropdownMenuBox : public Edit { @@ -530,7 +530,7 @@ Control* CharHeightPropertyBox::getControl() return mpControl; } -// ==================================================================== + class TransparencyPropertyBox : public PropertySubControl { @@ -972,7 +972,7 @@ Control* ScalePropertyBox::getControl() return mpControl; } -// ==================================================================== + class FontStylePropertyBox : public PropertySubControl { @@ -1109,7 +1109,7 @@ Control* FontStylePropertyBox::getControl() return mpControl; } -// ==================================================================== + class CustomAnimationEffectTabPage : public TabPage { @@ -1211,9 +1211,9 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con OUString aPresetId; pSet->getPropertyValue( nHandlePresetId ) >>= aPresetId; - // + // property 1 - // + if( pSet->getPropertyState( nHandleProperty1Type ) != STLPropertyState_AMBIGUOUS ) { @@ -1242,9 +1242,9 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con mpFTProperty1->Enable( mpLBProperty1->IsEnabled() ); - // + // accelerate & deccelerate - // + if( pSet->getPropertyState( nHandleAccelerate ) == STLPropertyState_DIRECT ) { @@ -1260,9 +1260,9 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con } } - // + // init after effect controls - // + mpLBAfterEffect->SetSelectHdl( LINK( this, CustomAnimationEffectTabPage, implSelectHdl ) ); mpLBTextAnim->SetSelectHdl( LINK( this, CustomAnimationEffectTabPage, implSelectHdl ) ); @@ -2405,7 +2405,7 @@ void PropertyControl::Resize() ListBox::Resize(); } -// ==================================================================== + PropertySubControl::~PropertySubControl() { diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx index 08568fc236d6..f7d350bfc7f0 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationDialog.hxx @@ -32,7 +32,7 @@ class HelpButton; namespace sd { -// -------------------------------------------------------------------- + // property handles const sal_Int32 nHandleSound = 0; @@ -97,7 +97,7 @@ const sal_Int32 nPropertyTypeTransparency = 19; const sal_Int32 nPropertyTypeFontStyle = 20; const sal_Int32 nPropertyTypeScale = 21; -// -------------------------------------------------------------------- + class PropertySubControl { @@ -123,7 +123,7 @@ protected: sal_Int32 mnType; }; -// -------------------------------------------------------------------- + class PropertyControl : public ListBox { @@ -140,7 +140,7 @@ private: PropertySubControl* mpSubControl; }; -// -------------------------------------------------------------------- + class CustomAnimationDurationTabPage; class CustomAnimationEffectTabPage; diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index cca0944cadf5..16d8e9e5cd82 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -198,7 +198,7 @@ static OUString getDescription( const Any& rTarget, bool bWithText = true ) return aDescription; } -// ==================================================================== + class CustomAnimationListEntryItem : public SvLBoxString { @@ -316,7 +316,7 @@ void CustomAnimationListEntryItem::Clone( SvLBoxItem* ) { } -// ==================================================================== + class CustomAnimationListEntry : public SvTreeListEntry { @@ -350,7 +350,7 @@ CustomAnimationListEntry::~CustomAnimationListEntry() { } -// ==================================================================== + class CustomAnimationTriggerEntryItem : public SvLBoxString { @@ -454,7 +454,7 @@ void CustomAnimationTriggerEntryItem::Clone( SvLBoxItem* ) { } -// ==================================================================== + CustomAnimationList::CustomAnimationList( ::Window* pParent ) : SvTreeListBox( pParent, WB_TABSTOP | WB_BORDER | WB_HASLINES | WB_HASBUTTONS | WB_HASBUTTONSATROOT ) diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index f093d0afcb2e..18f0b90e17d3 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -2274,7 +2274,7 @@ void CustomAnimationPane::updatePathFromMotionPathTag( const rtl::Reference< Mot } } -// ==================================================================== + ::Window * createCustomAnimationPanel( ::Window* pParent, ViewShellBase& rBase, const cssu::Reference<css::frame::XFrame>& rxFrame ) diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index f18fd643d051..54564b5bb109 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -58,7 +58,7 @@ class ViewShellBase; typedef std::vector< rtl::Reference< MotionPathTag > > MotionPathTagVector; -// -------------------------------------------------------------------- + class CustomAnimationPane : public PanelLayout, public ICustomAnimationListController { diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index fc8a1521ff62..792e1f9efb25 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -60,11 +60,9 @@ using ::com::sun::star::uno::RuntimeException; using ::sd::framework::FrameworkHelper; -// ____________________________ -// -// ::sd::impl::TransitionEffect -// ____________________________ + +// ::sd::impl::TransitionEffect namespace sd { namespace impl @@ -232,11 +230,9 @@ struct TransitionEffect } // namespace impl } // namespace sd -// ______________________ -// -// Local Helper Functions -// ______________________ + +// Local Helper Functions namespace { @@ -421,11 +417,9 @@ void lcl_FillSoundListBox( namespace sd { -// ___________________ -// -// SlideTransitionPane -// ___________________ + +// SlideTransitionPane SlideTransitionPane::SlideTransitionPane( ::Window * pParent, ViewShellBase & rBase, @@ -522,8 +516,6 @@ void SlideTransitionPane::UpdateLook (void) } - - void SlideTransitionPane::onSelectionChanged() { updateControls(); @@ -1046,7 +1038,7 @@ IMPL_LINK_NOARG(SlideTransitionPane, SoundListBoxSelected) sal_uInt16 nPos = mpLB_SOUND->GetSelectEntryPos(); if( nPos == 2 ) { - // other sound ... + // other sound... openSoundFileDialog(); } } diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index 080b33cc41eb..c65f3050d2a9 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -354,7 +354,7 @@ Pointer SdPathHdl::GetSdrDragPointer() const return Pointer( eStyle ); } -// ==================================================================== + MotionPathTag::MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, const CustomAnimationEffectPtr& pEffect ) : SmartTag( rView ) diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 876b8f1aac40..71d12c73e308 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -1088,7 +1088,7 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation } } -// ==================================================================== + Color AnnotationManagerImpl::GetColor(sal_uInt16 aAuthorIndex) { @@ -1203,7 +1203,7 @@ SdPage* AnnotationManagerImpl::GetCurrentPage() return mrBase.GetMainViewShell()->getCurrentPage(); } -// ==================================================================== + AnnotationManager::AnnotationManager( ViewShellBase& rViewShellBase ) : mxImpl( new AnnotationManagerImpl( rViewShellBase ) ) diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index aff8b343f247..6f5ce349571c 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -289,7 +289,7 @@ Pointer AnnotationHdl::GetSdrDragPointer() const return Pointer( eStyle ); } -// ==================================================================== + AnnotationTag::AnnotationTag( AnnotationManagerImpl& rManager, ::sd::View& rView, const Reference< XAnnotation >& xAnnotation, Color& rColor, int nIndex, const Font& rFont ) : SmartTag( rView ) diff --git a/sd/source/ui/app/popup2_tmpl.src b/sd/source/ui/app/popup2_tmpl.src index 2b2cbdca3aec..0cb12a0e64de 100644 --- a/sd/source/ui/app/popup2_tmpl.src +++ b/sd/source/ui/app/popup2_tmpl.src @@ -28,9 +28,8 @@ -// + // TEXTOBJ_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_TEXTOBJ_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -54,11 +53,11 @@ MN_DISTRIBUTE MNSUB_CONVERT - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP SEPARATOR @@ -70,9 +69,8 @@ }; }; -// + // OUTLINETEXTOBJ_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_OUTLINETEXTOBJ_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -97,11 +95,11 @@ MN_DISTRIBUTE MNSUB_CONVERT - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP SEPARATOR @@ -113,9 +111,8 @@ }; }; -// + // GEOMOBJ_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_GEOMOBJ_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -141,11 +138,11 @@ MN_LEAVE_GROUP MN_DISMANTLE - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP SEPARATOR @@ -157,9 +154,8 @@ }; }; -// + // Customshape POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_CUSTOMSHAPE_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -185,11 +181,11 @@ MN_LEAVE_GROUP MN_DISMANTLE - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP SEPARATOR @@ -203,9 +199,8 @@ }; }; -// + // 3DOSCENE_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_3DSCENE_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -226,11 +221,11 @@ MN_ENTER_GROUP MN_3D_WIN - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP SEPARATOR @@ -242,9 +237,8 @@ }; }; -// + // 3DOSCENE2_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_3DSCENE2_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -266,11 +260,11 @@ MN_LEAVE_GROUP MN_3D_WIN - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP SEPARATOR @@ -282,9 +276,8 @@ }; }; -// + // 3DOBJ_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_3DOBJ_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -305,11 +298,11 @@ MN_LEAVE_GROUP MN_3D_WIN - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP SEPARATOR @@ -321,9 +314,8 @@ }; }; -// + // GROUPOBJ_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_GROUPOBJ_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -345,11 +337,11 @@ MNSUB_MIRROR MNSUB_CONVERT - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_UNGROUP @@ -362,9 +354,8 @@ }; }; -// + // LINEOBJ_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_LINEOBJ_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -388,11 +379,11 @@ MN_LEAVE_GROUP MN_DISMANTLE - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP SEPARATOR @@ -404,9 +395,8 @@ }; }; -// + // EDGEOBJ_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_EDGEOBJ_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -432,11 +422,11 @@ MN_LEAVE_GROUP MN_DISMANTLE - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP SEPARATOR @@ -448,9 +438,8 @@ }; }; -// + // MEASUREOBJ_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_MEASUREOBJ_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -476,11 +465,11 @@ MN_LEAVE_GROUP MN_DISMANTLE - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP SEPARATOR @@ -493,9 +482,8 @@ }; -// + // POLYLINEOBJ_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_POLYLINEOBJ_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -521,11 +509,11 @@ MN_DISMANTLE MN_BREAK - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP SEPARATOR @@ -537,9 +525,8 @@ }; }; -// + // NOSEL_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_NOSEL_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -568,9 +555,8 @@ }; }; -// + // MULTISELECTION_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_MULTISELECTION_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -609,9 +595,8 @@ }; }; -// + // GRAPHIC_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_GRAPHIC_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -636,11 +621,11 @@ MNSUB_CONVERT MN_BREAK - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP SEPARATOR @@ -657,9 +642,7 @@ }; }; -// // OLE2_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_OLE2_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -671,30 +654,30 @@ MN_TRANSFORM MN_ORIGINAL_SIZE - //-#i118485# Added support for Line,Area and Text + // #i118485# Added support for Line,Area and Text MN_LINE MN_AREA SEPARATOR MN_CHAR_PARAGRAPH SEPARATOR - //-#i118485#---------------------- + // #i118485# MN_OBJECT_ALIGN MN_POSITION MN_DISTRIBUTE - //-#i118485# Added support for conversions + // #i118485# Added support for conversions MNSUB_MIRROR MNSUB_CONVERT - //-#i118485#---------------------- + // #i118485# MN_BREAK - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP SEPARATOR @@ -704,10 +687,7 @@ }; }; - -// // PAGETAB_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_PAGETAB_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -728,9 +708,8 @@ }; }; -// + // Media_POPUP -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_MEDIA_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP @@ -746,11 +725,11 @@ MN_DISTRIBUTE MN_BREAK - //-#i68101#---------------------- + // #i68101# SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP - //-#i68101#---------------------- + // #i68101# #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP SEPARATOR @@ -760,9 +739,8 @@ }; }; -// + // Table shape context menu -// #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_TABLE_POPUP #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src index cc489966cc42..6596db03f0ca 100644 --- a/sd/source/ui/app/res_bmp.src +++ b/sd/source/ui/app/res_bmp.src @@ -336,7 +336,7 @@ Bitmap BMP_WAIT_ICON File = "waiticon.bmp"; }; -// ---------------------------------------- + Bitmap BMP_FADE_EFFECT_INDICATOR { diff --git a/sd/source/ui/app/tbxids_tmpl.src b/sd/source/ui/app/tbxids_tmpl.src index 80351507509b..13e718a0a1d5 100644 --- a/sd/source/ui/app/tbxids_tmpl.src +++ b/sd/source/ui/app/tbxids_tmpl.src @@ -21,9 +21,8 @@ #define _TBXIDS_SRC #define SEPARATOR ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; #define TBI(x) ToolBoxItem { x }; - // + // Toolbox bar - // #define TBI_OBJECT_SELECT \ ToolBoxItem\ {\ @@ -260,9 +259,9 @@ Hide = TRUE; \ }; - // + // Object bar - // + #define TBI_FORMAT_BEZIER_EDIT_RC \ ToolBoxItem\ {\ @@ -377,9 +376,9 @@ - // + // Option bar - // + #define TBI_FORMAT_BEZIER_EDIT \ ToolBoxItem\ {\ diff --git a/sd/source/ui/app/toolbox2_tmpl.src b/sd/source/ui/app/toolbox2_tmpl.src index 8e898fb8291a..aaed1afd3a6f 100644 --- a/sd/source/ui/app/toolbox2_tmpl.src +++ b/sd/source/ui/app/toolbox2_tmpl.src @@ -23,9 +23,8 @@ #include <svx/svxids.hrc> #include <svx/globlmn.hrc> #endif - // + // toolbox bar - // ToolBox SD_TOOLBOX { HelpId = HID_SD_DRAW_TOOLBOX ; @@ -127,9 +126,8 @@ ToolBox SD_TOOLBOX }; }; }; - // + // object bar - // #if SD_TOOLBOX == RID_DRAW_TOOLBOX ToolBox RID_DRAW_OBJ_TOOLBOX #elif SD_TOOLBOX == RID_GRAPHIC_TOOLBOX @@ -171,9 +169,8 @@ ToolBox RID_GRAPHIC_OBJ_TOOLBOX TBI_IMAGEMAP }; }; - // - // option bar - // + +// option bar #if SD_TOOLBOX == RID_DRAW_TOOLBOX ToolBox RID_DRAW_OPTIONS_TOOLBOX #elif SD_TOOLBOX == RID_GRAPHIC_TOOLBOX diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 86de6d3f04b4..605fd24f413e 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -309,7 +309,7 @@ IMPL_LINK( LayoutToolbarMenu, SelectHdl, void *, pControl ) return 0; } -// ==================================================================== + OUString SlideLayoutController_getImplementationName() { @@ -357,9 +357,9 @@ Reference< XInterface > SAL_CALL InsertSlideController_createInstance( const Ref new SlideLayoutController( comphelper::getComponentContext(rSMgr), ".uno:InsertPage" , true ) ); } -//======================================================================== + // class SlideLayoutController -//======================================================================== + SlideLayoutController::SlideLayoutController( const Reference< uno::XComponentContext >& rxContext, const OUString& sCommandURL, bool bInsertPage ) : svt::PopupWindowController( rxContext, Reference< frame::XFrame >(), sCommandURL ) diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx index eda2615eaa3a..c3147e4aeb72 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx @@ -362,10 +362,10 @@ void ClientBox::DrawRow( const Rectangle& rRect, const TClientBoxEntry pEntry ) // long nExtraHeight = 0; -// + // if ( pEntry->m_bHasButtons ) // nExtraHeight = m_nExtraHeight; -// + // DrawText( Rectangle( aPos.X(), aPos.Y(), rRect.Right(), rRect.Bottom() - nExtraHeight ), // sDescription, TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK ); } diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx index 9c5ca8f025fd..1c39e3b6ba5e 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx @@ -43,9 +43,8 @@ namespace sd { #define ICON_OFFSET 72 #define RIGHT_ICON_OFFSET 5 #define SPACE_BETWEEN 3 -//------------------------------------------------------------------------------ -// struct ClientBoxEntry -//------------------------------------------------------------------------------ + +// struct ClientBoxEntry struct ClientBoxEntry; struct ClientInfo; @@ -62,13 +61,11 @@ struct ClientBoxEntry }; -//------------------------------------------------------------------------------ -// class ExtensionBox_Impl -//------------------------------------------------------------------------------ +// class ExtensionBox_Impl class ClientBox; -//------------------------------------------------------------------------------ + class ClientRemovedListener : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener > { ClientBox *m_pParent; @@ -78,14 +75,12 @@ public: ClientRemovedListener( ClientBox *pParent ) { m_pParent = pParent; } ~ClientRemovedListener(); - //=================================================================================== + // XEventListener virtual void SAL_CALL disposing( ::com::sun::star::lang::EventObject const & evt ) throw (::com::sun::star::uno::RuntimeException); }; - -//------------------------------------------------------------------------------ class ClientBox: public Control { @@ -130,7 +125,7 @@ class ClientBox: bool HandleCursorKey( sal_uInt16 nKeyCode ); void DeleteRemoved(); - //----------------- + DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar* ); //Index starts with 1. @@ -162,7 +157,7 @@ public: void RecalcAll(); void RemoveUnlocked(); - //----------------- + void selectEntry( const long nPos ); long addEntry( ClientInfo* pClientInfo ); void updateEntry( const ClientInfo* rPackageInfo ); diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index 049924b63e7b..19a6bac34d49 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -30,12 +30,7 @@ #include <vcl/msgbox.hxx> #include "svtools/treelistentry.hxx" - -///////////////////// -// SdCustomShowDlg // -///////////////////// - - +// SdCustomShowDlg SdCustomShowDlg::SdCustomShowDlg( Window* pWindow, SdDrawDocument& rDrawDoc ) : ModalDialog ( pWindow, "CustomSlideShows", "modules/simpress/ui/customslideshows.ui" ), @@ -252,9 +247,7 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) return( 0L ); } -/** - * StartShow-Hdl - */ +// StartShow-Hdl IMPL_LINK_NOARG(SdCustomShowDlg, StartShowHdl) { EndDialog( RET_YES ); @@ -262,21 +255,13 @@ IMPL_LINK_NOARG(SdCustomShowDlg, StartShowHdl) return 0; } -/** - * CheckState - */ +// CheckState sal_Bool SdCustomShowDlg::IsCustomShow() const { return( m_pCbxUseCustomShow->IsEnabled() && m_pCbxUseCustomShow->IsChecked() ); } - - -/////////////////////////// -// SdDefineCustomShowDlg // -/////////////////////////// - - +// SdDefineCustomShowDlg SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window* pWindow, SdDrawDocument& rDrawDoc, SdCustomShow*& rpCS ) : ModalDialog ( pWindow, "DefineCustomSlideShow", "modules/simpress/ui/definecustomslideshow.ui" ), @@ -321,7 +306,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window* pWindow, OUString aStr( pPage->GetName() ); m_pLbPages->InsertEntry( aStr ); } - //aLbPages.SelectEntryPos( 0 ); + // aLbPages.SelectEntryPos( 0 ); if( rpCustomShow ) { @@ -355,9 +340,7 @@ SdDefineCustomShowDlg::~SdDefineCustomShowDlg() { } -/** - * CheckState - */ +// CheckState void SdDefineCustomShowDlg::CheckState() { sal_Bool bPages = m_pLbPages->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND; @@ -370,9 +353,7 @@ void SdDefineCustomShowDlg::CheckState() m_pBtnRemove->Enable( bCSPages ); } -/** - * ButtonHdl() - */ +// ButtonHdl() IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p ) { if( p == m_pBtnAdd ) @@ -404,13 +385,13 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p ) } else if( p == m_pBtnRemove ) { - //sal_uInt16 nPos = aLbCustomPages.GetSelectEntryPos(); + // sal_uInt16 nPos = aLbCustomPages.GetSelectEntryPos(); SvTreeListEntry* pEntry = m_pLbCustomPages->FirstSelected(); if( pEntry ) { sal_uLong nPos = m_pLbCustomPages->GetModel()->GetAbsPos( pEntry ); - //rpCustomShow->Remove( nPos ); - //aLbCustomPages.RemoveEntry( nPos ); + // rpCustomShow->Remove( nPos ); + // aLbCustomPages.RemoveEntry( nPos ); m_pLbCustomPages->GetModel()->Remove( m_pLbCustomPages->GetModel()->GetEntryAtAbsPos( nPos ) ); bModified = sal_True; @@ -418,7 +399,7 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p ) } else if( p == m_pEdtName ) { - //rpCustomShow->SetName( aEdtName.GetText() ); + // rpCustomShow->SetName( aEdtName.GetText() ); bModified = sal_True; } @@ -483,9 +464,7 @@ void SdDefineCustomShowDlg::CheckCustomShow() } } -/** - * OK-Hdl - */ +// OK-Hdl IMPL_LINK_NOARG(SdDefineCustomShowDlg, OKHdl) { // check name... diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx index 553553994ee8..b90d2de7e6c7 100644 --- a/sd/source/ui/dlg/diactrl.cxx +++ b/sd/source/ui/dlg/diactrl.cxx @@ -37,11 +37,7 @@ using namespace ::com::sun::star; SFX_IMPL_TOOLBOX_CONTROL( SdTbxCtlDiaPages, SfxUInt16Item ) - -//======================================================================== // SdPagesField -//======================================================================== - SdPagesField::SdPagesField( Window* pParent, const uno::Reference< frame::XFrame >& rFrame, WinBits nBits ) : @@ -113,13 +109,13 @@ SdTbxCtlDiaPages::SdTbxCtlDiaPages( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& { } -//======================================================================== + SdTbxCtlDiaPages::~SdTbxCtlDiaPages() { } -//======================================================================== + void SdTbxCtlDiaPages::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) @@ -147,7 +143,7 @@ void SdTbxCtlDiaPages::StateChanged( sal_uInt16, } } -//======================================================================== + Window* SdTbxCtlDiaPages::CreateItemWindow( Window* pParent ) { diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index ef79fdb83a6b..8b7df0406d26 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -85,8 +85,8 @@ void InterpolateFixedBitmap( FixedBitmap * pBitmap ) } -// ==================================================================== -// ==================================================================== + + const char* PageHelpIds[] = { @@ -97,7 +97,7 @@ const char* PageHelpIds[] = HID_SD_AUTOPILOT_PAGE5 }; -// ==================================================================== + class PasswordEntry { @@ -106,7 +106,7 @@ public: OUString maPath; }; -// ==================================================================== + /** A simple wrapper that looks like a PushButton and is used to force the broadcasting of focus events primarly for accessibility tools. @@ -132,7 +132,7 @@ private: -// ==================================================================== + class AssistentDlgImpl : public SfxListener { @@ -346,7 +346,7 @@ public: -// ==================================================================== + AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, sal_Bool bAutoPilot ) : mpTemplateRegion(NULL), @@ -1818,7 +1818,7 @@ Image AssistentDlgImpl::GetUiIconForCommand (const OUString& sCommandURL) } -////////////////////////////////////////////// + AssistentDlg::AssistentDlg(Window* pParent, sal_Bool bAutoPilot) : ModalDialog(pParent,SdResId(DLG_ASS)) diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 3756d86754e3..a6d4f06f8167 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -42,9 +42,8 @@ #include "drawdoc.hxx" #include "ViewShell.hxx" -/////////////////////////////////////////////////////////////////////// + // preview control for presentation layout -/////////////////////////////////////////////////////////////////////// #include <vcl/ctrl.hxx> #include <tools/color.hxx> #include <i18nlangtag/mslangid.hxx> @@ -88,9 +87,9 @@ public: } -/////////////////////////////////////////////////////////////////////// + // tab page for slide & header'n'notes -/////////////////////////////////////////////////////////////////////// + namespace sd { @@ -173,7 +172,7 @@ public: } -/////////////////////////////////////////////////////////////////////// + using namespace ::sd; @@ -426,7 +425,7 @@ void HeaderFooterDialog::change( SdUndoGroup* pUndoGroup, SdPage* pPage, const H pPage->setHeaderFooterSettings( rNewSettings ); } -/////////////////////////////////////////////////////////////////////// + HeaderFooterTabPage::HeaderFooterTabPage( HeaderFooterDialog* pDialog, ::Window* pWindow, SdDrawDocument* pDoc, SdPage* pActualPage, bool bHandoutMode ) : TabPage( pWindow, "HeaderFooterTab", "modules/simpress/ui/headerfootertab.ui" ), @@ -731,7 +730,7 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, boo } } -/////////////////////////////////////////////////////////////////////// + PresLayoutPreview::PresLayoutPreview( ::Window* pParent ) : Control(pParent) diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx index 1deda09f7243..7eef3b88557f 100644 --- a/sd/source/ui/framework/configuration/Configuration.cxx +++ b/sd/source/ui/framework/configuration/Configuration.cxx @@ -348,7 +348,7 @@ void Configuration::ThrowIfDisposed (void) const -//============================================================================= + bool AreConfigurationsEquivalent ( const Reference<XConfiguration>& rxConfiguration1, diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx index d9fccbab2d30..75388099f7f3 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.hxx +++ b/sd/source/ui/framework/factories/FullScreenPane.hxx @@ -72,7 +72,7 @@ public: throw (cssu::RuntimeException); - //------------------------------------------------------------------------- + DECL_LINK(WindowEventHandler, VclWindowEvent*); diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 83caf19e1809..5a91b7428fc7 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -176,7 +176,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) EE_PARA_WRITINGDIR, EE_PARA_WRITINGDIR, 0); - /////////////////////////////////////////////////////////////////////// + // Retrieve additional data for dialog SvxShadowItem aShadowItem(SID_ATTR_BORDER_SHADOW); @@ -188,7 +188,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) mpDoc->GetDefaultWritingMode() == ::com::sun::star::text::WritingMode_RL_TB ? FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP, EE_PARA_WRITINGDIR ) ); - /////////////////////////////////////////////////////////////////////// + // Retrieve page-data for dialog SvxPageItem aPageItem( SID_ATTR_PAGE ); @@ -226,7 +226,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) aNewAttr.Put( SfxBoolItem( SID_ATTR_PAGE_EXT2, bFullSize ) ); - /////////////////////////////////////////////////////////////////////// + // Merge ItemSet for dialog const sal_uInt16* pPtr = aNewAttr.GetRanges(); @@ -481,7 +481,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) if( !pArgs ) return; - /////////////////////////////////////////////////////////////////////////// + // Set new page-attributes PageKind ePageKind = mpDrawViewShell->GetPageKind(); const SfxPoolItem* pPoolItem; @@ -574,13 +574,13 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) if( bSetPageSizeAndBorder || !mbMasterPage ) mpDrawViewShell->SetPageSizeAndBorder(ePageKind, aNewSize, nLeft, nRight, nUpper, nLower, bScaleAll, eOrientation, nPaperBin, bFullSize ); - //////////////////////////////////////////////////////////////////////////////// - // + + // if bMasterPage==sal_False then create a background-object for this page with the // properties set in the dialog before, but if mbPageBckgrdDeleted==sal_True then // the background of this page was set to invisible, so it would be a mistake // to create a new background-object for this page ! - // + if( mbDisplayBackgroundTabPage ) { diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 5f151f2cccd2..f232be019230 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -807,7 +807,7 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) // is used, then ImpSetAttributesForNewTextObject is called and then the object is // deleted again since not the minimum drag distance was travelled. Then, a new // klick text object is created and thus all that stuff needs to be set again here. - // + // Before using the new object the vertical writing mode // needs to be set. This is done here at the OutlinerParaObject // directly to not mirror the layout text items involved. These items will be set diff --git a/sd/source/ui/func/smarttag.cxx b/sd/source/ui/func/smarttag.cxx index e5cbc4f0d2e8..e58cdc5b65ec 100644 --- a/sd/source/ui/func/smarttag.cxx +++ b/sd/source/ui/func/smarttag.cxx @@ -26,7 +26,7 @@ namespace sd { -// ==================================================================== + SmartTag::SmartTag( ::sd::View& rView ) : mrView( rView ) @@ -143,7 +143,7 @@ void SmartTag::CheckPossibilities() { } -// ==================================================================== + SmartTagSet::SmartTagSet( View& rView ) : mrView( rView ) @@ -425,7 +425,7 @@ void SmartTagSet::CheckPossibilities() mxSelectedTag->CheckPossibilities(); } -// ==================================================================== + SmartHdl::SmartHdl( const SmartTagReference& xTag, SdrObject* pObject, const Point& rPnt, SdrHdlKind eNewKind /*=HDL_MOVE*/ ) : SdrHdl( rPnt, eNewKind ) diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index d4e46fc0aced..c899ea24a5dd 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -44,10 +44,8 @@ namespace sd { class FrameView; class ViewShell; -// ------------------ -// - DrawDocShell - -// ------------------ +// DrawDocShell class SD_DLLPUBLIC DrawDocShell : public SfxObjectShell { public: diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index 239b8fa4c70a..d8ce41627f3f 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -55,10 +55,8 @@ class ViewShell; class Window; class ViewClipboard; -// ------------------- -// - SdViewRedrawRec - -// ------------------- +// SdViewRedrawRec struct SdViewRedrawRec { OutputDevice* mpOut; diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx index 7bbf8a6360a9..5dbbbc77a5e9 100644 --- a/sd/source/ui/inc/ViewTabBar.hxx +++ b/sd/source/ui/inc/ViewTabBar.hxx @@ -132,7 +132,7 @@ public: virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence<sal_Int8>& rId) throw (com::sun::star::uno::RuntimeException); - // ------------------------------------------------------------------------ + /** The returned value is calculated as the difference between the total height of the control and the heigh of its first tab page. diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index fc156511a50d..c740269478d3 100644 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -45,7 +45,7 @@ namespace sd { class AnimationControllerItem; class View; -//------------------------------------------------------------------------ + enum BitmapAdjustment { @@ -60,7 +60,7 @@ enum BitmapAdjustment BA_RIGHT_DOWN }; -//------------------------------------------------------------------------ + class SdDisplay : public Control { @@ -80,7 +80,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); }; -//------------------------------------------------------------------------ + class AnimationWindow : public SfxDockingWindow { @@ -147,7 +147,7 @@ private: AnimationControllerItem* pControllerItem; ScopeLock maPlayLock; - //------------------------------------ + DECL_LINK( ClickFirstHdl, void * ); DECL_LINK( ClickStopHdl, void * ); diff --git a/sd/source/ui/inc/annotationmanager.hxx b/sd/source/ui/inc/annotationmanager.hxx index a5f5d00fe432..4527b146f4aa 100644 --- a/sd/source/ui/inc/annotationmanager.hxx +++ b/sd/source/ui/inc/annotationmanager.hxx @@ -30,7 +30,7 @@ namespace sd class ViewShellBase; class AnnotationManagerImpl; -// -------------------------------------------------------------------- + class AnnotationManager { diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx index de1a1917f188..4f70008ead40 100644 --- a/sd/source/ui/inc/custsdlg.hxx +++ b/sd/source/ui/inc/custsdlg.hxx @@ -32,7 +32,7 @@ class SdDrawDocument; class SdCustomShow; class SdCustomShowList; -//------------------------------------------------------------------------ + class SdCustomShowDlg : public ModalDialog { @@ -66,7 +66,7 @@ public: }; -//------------------------------------------------------------------------ + class SdDefineCustomShowDlg : public ModalDialog { diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx index 35ae462b1134..1a7734785b57 100644 --- a/sd/source/ui/inc/diactrl.hxx +++ b/sd/source/ui/inc/diactrl.hxx @@ -30,7 +30,7 @@ #include <sfx2/tbxctrl.hxx> #include <com/sun/star/frame/XFrame.hpp> -//======================================================================== + // SdPagesField: class SdPagesField : public SvxMetricField @@ -49,9 +49,9 @@ public: void UpdatePagesField( const SfxUInt16Item* pItem ); }; -//======================================================================== + // SdTbxCtlDiaPages: -//======================================================================== + class SdTbxCtlDiaPages : public SfxToolBoxControl { diff --git a/sd/source/ui/inc/ins_paste.hxx b/sd/source/ui/inc/ins_paste.hxx index bfbc62d2491d..adc8e0efb9e4 100644 --- a/sd/source/ui/inc/ins_paste.hxx +++ b/sd/source/ui/inc/ins_paste.hxx @@ -27,10 +27,8 @@ #include <vcl/dialog.hxx> #include "sdresid.hxx" -// -------------------- -// - SdInsertPasteDlg - -// -------------------- +// SdInsertPasteDlg class SD_DLLPUBLIC SdInsertPasteDlg : public ModalDialog { private: diff --git a/sd/source/ui/inc/inspagob.hxx b/sd/source/ui/inc/inspagob.hxx index ae2f68aa770e..70b6a89c6981 100644 --- a/sd/source/ui/inc/inspagob.hxx +++ b/sd/source/ui/inc/inspagob.hxx @@ -26,7 +26,7 @@ class SdDrawDocument; -//------------------------------------------------------------------------ + class SdInsertPagesObjsDlg : public ModalDialog { diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index 2a9b910e69cd..582cf3cf1fe5 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -55,7 +55,7 @@ class Menu; class SdNavigatorControllerItem; class SdPageNameControllerItem; -//------------------------------------------------------------------------ + class NavDocInfo { @@ -75,7 +75,7 @@ private: ::sd::DrawDocShell* mpDocShell; }; -//------------------------------------------------------------------------ + class SdNavigatorWin : public Window diff --git a/sd/source/ui/inc/pubdlg.hrc b/sd/source/ui/inc/pubdlg.hrc index 77d84a892af8..1648902e8ced 100644 --- a/sd/source/ui/inc/pubdlg.hrc +++ b/sd/source/ui/inc/pubdlg.hrc @@ -25,7 +25,7 @@ #define PAGE1_DEL_DESIGN 6 #define PAGE1_DESC 7 -////////////////////////////// + #define PAGE2_TITEL 21 #define PAGE2_STANDARD 22 @@ -60,7 +60,7 @@ #define PAGE2_CGI 48 #define PAGE2_VERT 49 -////////////////////////////// + #define PAGE3_TITEL_1 51 #define PAGE3_PNG 51 @@ -77,7 +77,7 @@ #define PAGE3_VERT 62 #define PAGE3_HIDDEN_SLIDES 63 -////////////////////////////// + #define PAGE4_TITEL_1 66 #define PAGE4_AUTHOR_TXT 67 @@ -91,13 +91,13 @@ #define PAGE4_DOWNLOAD 75 #define PAGE4_CREATED 76 -////////////////////////////// + #define PAGE5_TITEL 81 #define PAGE5_TEXTONLY 82 #define PAGE5_BUTTONS 83 -////////////////////////////// + #define PAGE6_TITEL 101 #define PAGE6_DEFAULT 102 @@ -110,7 +110,7 @@ #define PAGE6_DOCCOLORS 109 #define PAGE6_PREVIEW 111 -////////////////////////////// + #define BUT_LAST 200 #define BUT_NEXT 201 @@ -119,7 +119,7 @@ #define BUT_HELP 204 #define BOTTOM_LINE 205 -////////////////////////////// + #define DLG_PUBLISHING 739 diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index 40c624e1c8f9..a36bf44dbce9 100644 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -25,10 +25,8 @@ #include <sfx2/objsh.hxx> #include <svl/lstner.hxx> -// ------------------ -// - SdTransferable - -// ------------------ +// SdTransferable class SdDrawDocument; class SdrObject; class INetBookmark; diff --git a/sd/source/ui/inc/taskpane/PanelId.hxx b/sd/source/ui/inc/taskpane/PanelId.hxx index 6cb23e42c9e4..75401647ea19 100644 --- a/sd/source/ui/inc/taskpane/PanelId.hxx +++ b/sd/source/ui/inc/taskpane/PanelId.hxx @@ -21,15 +21,14 @@ #define INCLUDED_SD_SOURCE_UI_INC_TASKPANE_PANELID_HXX -//...................................................................................................................... + namespace sd { namespace toolpanel { -//...................................................................................................................... - //================================================================================================================== - //= PanelId - //================================================================================================================== - /** List of top level panels that can be shown in the task pane. + + + /** PanelId + List of top level panels that can be shown in the task pane. */ enum PanelId { @@ -44,9 +43,8 @@ namespace sd { namespace toolpanel PanelId GetStandardPanelId( const OUString& i_rTaskPanelResourceURL ); -//...................................................................................................................... + } } // namespace sd::toolpanel -//...................................................................................................................... #endif // INCLUDED_SD_SOURCE_UI_INC_TASKPANE_PANELID_HXX diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 17675fd3f7a4..5f1e436e3848 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -80,7 +80,7 @@ private: OUString aLastFile; ::std::vector< long > aVerbVector; - //------------------------------------ + DECL_LINK( ClickSearchHdl, void * ); DECL_LINK( ClickActionHdl, void * ); diff --git a/sd/source/ui/inc/undoback.hxx b/sd/source/ui/inc/undoback.hxx index edcae533081d..65b8471cd10f 100644 --- a/sd/source/ui/inc/undoback.hxx +++ b/sd/source/ui/inc/undoback.hxx @@ -26,10 +26,8 @@ class SdDrawDocument; class SdPage; class SfxItemSet; -// ----------------------------- -// - SdBackgroundObjUndoAction - -// ----------------------------- +// SdBackgroundObjUndoAction class SdBackgroundObjUndoAction : public SdUndoAction { private: diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index 4f3b069f2bee..b53d7fd9d6dc 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -50,8 +50,7 @@ using namespace ::com::sun::star::lang; namespace sd { namespace presenter { -//===== Service =============================================================== - +// Service Reference<XInterface> SAL_CALL PresenterTextViewService_createInstance ( const Reference<XComponentContext>& rxContext) { @@ -78,8 +77,7 @@ Sequence<OUString> SAL_CALL PresenterTextViewService_getSupportedServiceNames (v -//===== PresenterTextView::Implementation ===================================== - +// PresenterTextView::Implementation class PresenterTextView::Implementation { public: @@ -129,8 +127,7 @@ private: -//===== PresenterTextView ===================================================== - +// PresenterTextView PresenterTextView::PresenterTextView (const Reference<XComponentContext>& rxContext) : PresenterTextViewInterfaceBase(), mpImplementation(new Implementation()) @@ -156,8 +153,7 @@ void SAL_CALL PresenterTextView::disposing (void) -//----- XInitialization ------------------------------------------------------- - +// XInitialization void SAL_CALL PresenterTextView::initialize (const Sequence<Any>& rArguments) throw (Exception, RuntimeException) { @@ -286,8 +282,7 @@ void PresenterTextView::ThrowIfDisposed (void) -//===== PresenterTextView::Implementation ===================================== - +// PresenterTextView::Implementation PresenterTextView::Implementation::Implementation (void) : msTextPropertyName("Text"), msBitmapPropertyName("Bitmap"), @@ -343,9 +338,9 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine (void) EditEngine* pEditEngine = mpEditEngine; if (pEditEngine == NULL) { - // + // set fonts to be used - // + SvtLinguOptions aOpt; SvtLinguConfig().GetOptions( aOpt ); diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx index e6ff9aa23194..7ee3e32b06d1 100644 --- a/sd/source/ui/remotecontrol/ImagePreparer.cxx +++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx @@ -178,7 +178,7 @@ void ImagePreparer::sendNotes( sal_uInt32 aSlideNumber ) // OUStringBuffer aStrBuffer; // ::sax::Converter::encodeBase64( aStrBuffer, aTemp ); -// + // OString aNotes = OUStringToOString( // aStrBuffer.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ); diff --git a/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h b/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h index defa6b7eb634..612b6eeeda2f 100755 --- a/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h +++ b/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h @@ -15,7 +15,7 @@ * limitations under the License. */ -//--------------------------------------------------------------------------------------------------------------------------- + /*! @header CommonServices Common Services for Mac OS X, Linux, Palm, VxWorks, Windows, and Windows CE. @@ -32,15 +32,12 @@ extern "C" { #pragma mark == Target == #endif -//=========================================================================================================================== -// Target -//=========================================================================================================================== +// Target // Macintosh - #if ( !defined( TARGET_OS_MAC ) ) #if ( ( macintosh || __MACH__ ) && !KERNEL ) -// ConditionalMacros.h in CoreServices will define this TARGET_* flag. + // ConditionalMacros.h in CoreServices will define this TARGET_* flag. #else #define TARGET_OS_MAC 0 #endif @@ -55,7 +52,6 @@ extern "C" { #endif // FreeBSD - #if ( !defined( TARGET_OS_FREEBSD ) ) #if ( defined( __FreeBSD__ ) ) #define TARGET_OS_FREEBSD 1 @@ -65,7 +61,6 @@ extern "C" { #endif // Linux - #if ( !defined( TARGET_OS_LINUX ) ) #if ( defined( __linux__ ) ) #define TARGET_OS_LINUX 1 @@ -75,7 +70,6 @@ extern "C" { #endif // Solaris - #if ( !defined( TARGET_OS_SOLARIS ) ) #if ( defined(solaris) || (defined(__SVR4) && defined(sun)) ) #define TARGET_OS_SOLARIS 1 @@ -85,7 +79,6 @@ extern "C" { #endif // Palm - #if ( !defined( TARGET_OS_PALM ) ) #if ( defined( __PALMOS_TRAPS__ ) || defined( __PALMOS_ARMLET__ ) ) #define TARGET_OS_PALM 1 @@ -95,7 +88,6 @@ extern "C" { #endif // VxWorks - #if ( !defined( TARGET_OS_VXWORKS ) ) // No predefined macro for VxWorks so just assume VxWorks if nothing else is set. @@ -108,7 +100,6 @@ extern "C" { #endif // Windows - #if ( !defined( TARGET_OS_WIN32 ) ) #if ( macintosh || __MACH__ ) // ConditionalMacros.h in CoreServices will define this TARGET_* flag. @@ -122,7 +113,6 @@ extern "C" { #endif // Windows CE - #if ( !defined( TARGET_OS_WINDOWS_CE ) ) #if ( defined( _WIN32_WCE ) ) #define TARGET_OS_WINDOWS_CE 1 @@ -135,10 +125,8 @@ extern "C" { #pragma mark == Includes == #endif -//=========================================================================================================================== -// Includes -//=========================================================================================================================== +// Includes #if ( !KERNEL ) #if defined(WIN32) && !defined(_WSPIAPI_COUNTOF) #define _WSPIAPI_COUNTOF(_Array) (sizeof(_Array) / sizeof(_Array[0])) @@ -161,7 +149,6 @@ extern "C" { #if ( __MACH__ ) // Mac OS X - #include <sys/types.h> #include <netinet/in.h> #include <arpa/inet.h> @@ -174,7 +161,6 @@ extern "C" { #else // Classic Mac OS - #include <ConditionalMacros.h> #include <MacTypes.h> @@ -183,7 +169,6 @@ extern "C" { #elif ( KERNEL ) // Mac OS X Kernel - #include <stdint.h> #include <libkern/OSTypes.h> @@ -201,14 +186,12 @@ extern "C" { #elif ( TARGET_OS_LINUX ) // Linux - #include <stdint.h> #include <arpa/inet.h> #elif ( TARGET_OS_SOLARIS ) // Solaris - #include <stdint.h> #include <arpa/inet.h> @@ -228,13 +211,11 @@ extern "C" { #elif ( TARGET_OS_VXWORKS ) // VxWorks - #include "vxWorks.h" #elif ( TARGET_OS_WIN32 ) // Windows - #if ( !defined( WIN32_WINDOWS ) ) #define WIN32_WINDOWS 0x0401 #endif @@ -285,12 +266,10 @@ extern "C" { #pragma mark == CPU == #endif -//=========================================================================================================================== -// CPU -//=========================================================================================================================== -// PowerPC +// CPU +// PowerPC #if ( !defined( TARGET_CPU_PPC ) ) #if ( defined( __ppc__ ) || defined( __PPC__ ) || defined( powerpc ) || defined( ppc ) || defined( _M_MPPC ) ) #define TARGET_CPU_PPC 1 @@ -300,7 +279,6 @@ extern "C" { #endif // x86 - #if ( !defined( TARGET_CPU_X86 ) ) #if ( __INTEL__ || defined( __i386__ ) || defined( i386 ) || defined( intel ) || defined( _M_IX86 ) ) #define TARGET_CPU_X86 1 @@ -310,7 +288,6 @@ extern "C" { #endif // MIPS - #if ( !defined( TARGET_CPU_MIPS ) ) #if ( __MIPS__ || defined( MIPS32 ) || defined( R3000 ) || defined( R4000 ) || defined( R4650 ) || defined( _M_MRX000 ) ) #define TARGET_CPU_MIPS 1 @@ -327,12 +304,10 @@ extern "C" { #pragma mark == Byte Order == #endif -//=========================================================================================================================== + // Byte Order -//=========================================================================================================================== // TARGET_RT_LITTLE_ENDIAN - #if ( !defined( TARGET_RT_LITTLE_ENDIAN ) ) #if ( MIPSEL || IL_LITTLE_ENDIAN || defined( __LITTLE_ENDIAN__ ) || \ ( defined( BYTE_ORDER ) && defined( LITTLE_ENDIAN ) && ( BYTE_ORDER == LITTLE_ENDIAN ) ) || \ @@ -346,7 +321,6 @@ extern "C" { #endif // TARGET_RT_BIG_ENDIAN - #if ( !defined( TARGET_RT_BIG_ENDIAN ) ) #if ( MIPSEB || IL_BIG_ENDIAN || defined( __BIG_ENDIAN__ ) || \ ( defined( BYTE_ORDER ) && defined( BIG_ENDIAN ) && ( BYTE_ORDER == BIG_ENDIAN ) ) || \ @@ -380,7 +354,6 @@ extern "C" { #endif // TARGET_RT_BYTE_ORDER - #if ( !defined( TARGET_RT_BYTE_ORDER_BIG_ENDIAN ) ) #define TARGET_RT_BYTE_ORDER_BIG_ENDIAN 1234 #endif @@ -401,10 +374,8 @@ extern "C" { #pragma mark == Constants == #endif -//=========================================================================================================================== -// Constants -//=========================================================================================================================== +// Constants #if ( !TARGET_OS_MAC ) #define CR '\r' #endif @@ -419,12 +390,10 @@ extern "C" { #pragma mark == Compatibility == #endif -//=========================================================================================================================== + // Compatibility -//=========================================================================================================================== // Macros to allow the same code to work on Windows and other sockets API-compatible platforms. - #if ( TARGET_OS_WIN32 ) #define close_compat( X ) closesocket( X ) #define errno_compat() (int) GetLastError() @@ -452,7 +421,7 @@ typedef int SocketRef; #endif // socklen_t is not defined on the following platforms so emulate it if not defined: -// + // - Pre-Panther Mac OS X. Panther defines SO_NOADDRERR so trigger off that. // - Windows SDK prior to 2003. 2003+ SDK's define EAI_AGAIN so trigger off that. // - VxWorks @@ -464,7 +433,7 @@ typedef int socklen_t; #endif // ssize_t is not defined on the following platforms so emulate it if not defined: -// + // - Mac OS X when not building with BSD headers // - Windows @@ -483,12 +452,11 @@ typedef int ssize_t; #endif #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined SOCKADDR_IS_IP_LOOPBACK @abstract Determines if a sockaddr is an IPv4 or IPv6 loopback address (if IPv6 is supported). */ - #if ( defined( AF_INET6 ) ) #define SOCKADDR_IS_IP_LOOPBACK( SA ) \ ( ( (const struct sockaddr *)( SA ) )->sa_family == AF_INET ) \ @@ -503,12 +471,11 @@ typedef int ssize_t; : 0 #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined SOCKADDR_IS_IP_LINK_LOCAL @abstract Determines if a sockaddr is an IPv4 or IPv6 link-local address (if IPv6 is supported). */ - #if ( defined( AF_INET6 ) ) #define SOCKADDR_IS_IP_LINK_LOCAL( SA ) \ ( ( ( (const struct sockaddr *)( SA ) )->sa_family == AF_INET ) \ @@ -526,7 +493,6 @@ typedef int ssize_t; // _beginthreadex and _endthreadex are not supported on Windows CE 2.1 or later (the C runtime issues with leaking // resources have apparently been resolved and they seem to have just ripped out support for the API) so map it to // CreateThread on Windows CE. - #if ( TARGET_OS_WINDOWS_CE ) #define _beginthreadex_compat( SECURITY_PTR, STACK_SIZE, START_ADDRESS, ARG_LIST, FLAGS, THREAD_ID_PTR ) \ (uintptr_t) CreateThread( SECURITY_PTR, STACK_SIZE, (LPTHREAD_START_ROUTINE) START_ADDRESS, ARG_LIST, FLAGS, \ @@ -560,7 +526,7 @@ typedef int ssize_t; #pragma mark == Macros == #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined kSizeCString @abstract A meta-value to pass to supported routines to indicate the size should be calculated with strlen. @@ -568,7 +534,7 @@ typedef int ssize_t; #define kSizeCString ( (size_t) -1 ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined sizeof_array @abstract Determines the number of elements in an array. @@ -576,7 +542,7 @@ typedef int ssize_t; #define sizeof_array( X ) ( sizeof( X ) / sizeof( X[ 0 ] ) ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined sizeof_element @abstract Determines the size of an array element. @@ -584,7 +550,7 @@ typedef int ssize_t; #define sizeof_element( X ) sizeof( X[ 0 ] ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined sizeof_string @abstract Determines the size of a constant C string, excluding the null terminator. @@ -592,7 +558,7 @@ typedef int ssize_t; #define sizeof_string( X ) ( sizeof( ( X ) ) - 1 ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined sizeof_field @abstract Determines the size of a field of a type. @@ -600,7 +566,7 @@ typedef int ssize_t; #define sizeof_field( TYPE, FIELD ) sizeof( ( ( (TYPE *) 0 )->FIELD ) ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function RoundUp @abstract Rounds X up to a multiple of Y. @@ -608,7 +574,7 @@ typedef int ssize_t; #define RoundUp( X, Y ) ( ( X ) + ( ( Y ) -( ( X ) % ( Y ) ) ) ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function IsAligned @abstract Returns non-zero if X is aligned to a Y byte boundary and 0 if not. Y must be a power of 2. @@ -616,7 +582,7 @@ typedef int ssize_t; #define IsAligned( X, Y ) ( ( ( X ) &( ( Y ) -1 ) ) == 0 ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function IsFieldAligned @abstract Returns non-zero if FIELD of type TYPE is aligned to a Y byte boundary and 0 if not. Y must be a power of 2. @@ -624,7 +590,7 @@ typedef int ssize_t; #define IsFieldAligned( X, TYPE, FIELD, Y ) IsAligned( ( (uintptr_t)( X ) ) + offsetof( TYPE, FIELD ), ( Y ) ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function AlignDown @abstract Aligns X down to a Y byte boundary. Y must be a power of 2. @@ -632,7 +598,7 @@ typedef int ssize_t; #define AlignDown( X, Y ) ( ( X ) &~( ( Y ) -1 ) ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function AlignUp @abstract Aligns X up to a Y byte boundary. Y must be a power of 2. @@ -640,7 +606,7 @@ typedef int ssize_t; #define AlignUp( X, Y ) ( ( ( X ) + ( ( Y ) -1 ) ) & ~( ( Y ) -1 ) ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function Min @abstract Returns the lesser of X and Y. @@ -650,7 +616,7 @@ typedef int ssize_t; #define Min( X, Y ) ( ( ( X ) < ( Y ) ) ? ( X ) : ( Y ) ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function Max @abstract Returns the greater of X and Y. @@ -660,7 +626,7 @@ typedef int ssize_t; #define Max( X, Y ) ( ( ( X ) > ( Y ) ) ? ( X ) : ( Y ) ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function InsertBits @abstract Inserts BITS (both 0 and 1 bits) into X, controlled by MASK and SHIFT, and returns the result. @@ -677,7 +643,7 @@ typedef int ssize_t; #define InsertBits( X, BITS, MASK, SHIFT ) ( ( ( X ) &~( MASK ) ) | ( ( ( BITS ) << ( SHIFT ) ) & ( MASK ) ) ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function ExtractBits @abstract Extracts bits from X, controlled by MASK and SHIFT, and returns the result. @@ -694,7 +660,7 @@ typedef int ssize_t; #define ExtractBits( X, MASK, SHIFT ) ( ( ( X ) >> ( SHIFT ) ) & ( ( MASK ) >> ( SHIFT ) ) ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function Stringify @abstract Stringify's an expression. @@ -734,9 +700,9 @@ typedef int ssize_t; #endif #if ( TARGET_LANGUAGE_C_LIKE ) -//=========================================================================================================================== + // Standard Types -//=========================================================================================================================== + #if ( !defined( INT8_MIN ) ) @@ -834,14 +800,14 @@ typedef unsigned long int uintptr_t; #pragma mark == bool == #endif -//=========================================================================================================================== + // Boolean Constants and Types -//=========================================================================================================================== + // C++ defines bool, true, and false. Metrowerks allows this to be controlled by the "bool" option though. // C99 defines __bool_true_false_are_defined when bool, true, and false are defined. // MacTypes.h defines true and false (Mac builds only). -// + // Note: The Metrowerks has to be in its own block because Microsoft Visual Studio .NET does not completely // short-circuit and gets confused by the option( bool ) portion of the conditional. @@ -892,7 +858,7 @@ typedef int bool; #define TYPE_BOOL 1 #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @typedef CStr255 @abstract 255 character null-terminated (C-style) string. @@ -904,7 +870,7 @@ typedef char CStr255[ 256 ]; #endif // TARGET_LANGUAGE_C_LIKE -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined TYPE_LONGLONG_NATIVE @abstract Defines whether long long (or its equivalent) is natively supported or requires special libraries. @@ -918,7 +884,7 @@ typedef char CStr255[ 256 ]; #endif #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined long_long_compat @abstract Compatibility type to map to the closest thing to long long and unsigned long long. @@ -943,7 +909,7 @@ typedef unsigned long long unsigned_long_long_compat; #pragma mark == Errors == #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @enum OSStatus @abstract Status Code @@ -1100,11 +1066,11 @@ typedef int32_t OSStatus; #pragma mark == Mac Compatibility == #endif -//=========================================================================================================================== + // Mac Compatibility -//=========================================================================================================================== -//--------------------------------------------------------------------------------------------------------------------------- + + /*! @enum Duration @abstract Type used to specify a duration of time. @@ -1158,7 +1124,7 @@ typedef int32_t Duration; #define kWeeksPerYear 52 #define kMonthsPerYear 12 -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined VersionStages @abstract NumVersion-style version stages. @@ -1169,7 +1135,7 @@ typedef int32_t Duration; #define kVersionStageBeta 0x60 #define kVersionStageFinal 0x80 -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function NumVersionBuild @abstract Builds a 32-bit Mac-style NumVersion value (e.g. NumVersionBuild( 1, 2, 3, kVersionStageBeta, 4 ) -> 1.2.3b4). @@ -1189,7 +1155,7 @@ typedef int32_t Duration; #define NumVersionExtractStage( VERSION ) ( (uint8_t)( ( ( VERSION ) >> 8 ) & 0xFF ) ) #define NumVersionExtractRevision( VERSION ) ( (uint8_t)( ( VERSION ) & 0xFF ) ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function NumVersionCompare @abstract Compares two NumVersion values and returns the following values: @@ -1207,7 +1173,7 @@ int NumVersionCompare( uint32_t inLeft, uint32_t inRight ); #pragma mark == Binary Constants == #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined binary_4 @abstract Macro to generate an 4-bit constant using binary notation (e.g. binary_4( 1010 ) == 0xA). @@ -1217,7 +1183,7 @@ int NumVersionCompare( uint32_t inLeft, uint32_t inRight ); #define binary_4_hex_wrap( a ) binary_4_hex( a ) #define binary_4_hex( a ) ( 0x ## a ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined binary_8 @abstract Macro to generate an 8-bit constant using binary notation (e.g. binary_8( 01111011 ) == 0x7B). @@ -1227,7 +1193,7 @@ int NumVersionCompare( uint32_t inLeft, uint32_t inRight ); #define binary_8_hex_wrap( a ) binary_8_hex( a ) #define binary_8_hex( a ) ( 0x ## a ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined binary_16 @abstract Macro to generate an 16-bit constant using binary notation (e.g. binary_16( 01111011, 01111011 ) == 0x7B7B). @@ -1237,7 +1203,7 @@ int NumVersionCompare( uint32_t inLeft, uint32_t inRight ); #define binary_16_hex_wrap( a, b ) binary_16_hex( a, b ) #define binary_16_hex( a, b ) ( 0x ## a ## b ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined binary_32 @abstract Macro to generate an 32-bit constant using binary notation @@ -1514,7 +1480,7 @@ int NumVersionCompare( uint32_t inLeft, uint32_t inRight ); #pragma mark == Debugging == #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function CommonServicesTest @abstract Unit test. diff --git a/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c b/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c index 3bcc42380d8c..6e397c805235 100755 --- a/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c +++ b/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c @@ -23,10 +23,8 @@ #pragma mark == Includes == #endif -//=========================================================================================================================== -// Includes -//=========================================================================================================================== +// Includes #if ( !KERNEL ) #include <ctype.h> #include <stdio.h> @@ -57,7 +55,6 @@ #endif // If MDNS_DEBUGMSGS is defined (even if defined 0), it is aware of mDNS and it is probably safe to include mDNSEmbeddedAPI.h. - #if ( defined( MDNS_DEBUGMSGS ) ) #include "mDNSEmbeddedAPI.h" #endif @@ -66,70 +63,58 @@ #pragma mark == Macros == #endif -//=========================================================================================================================== -// Macros -//=========================================================================================================================== +// Macros #define DebugIsPrint( C ) ( ( ( C ) >= 0x20 ) && ( ( C ) <= 0x7E ) ) #if 0 #pragma mark == Prototypes == #endif -//=========================================================================================================================== -// Prototypes -//=========================================================================================================================== +// Prototypes static OSStatus DebugPrint( DebugLevel inLevel, char *inData, size_t inSize ); // fprintf - #if ( DEBUG_FPRINTF_ENABLED ) static OSStatus DebugFPrintFInit( DebugOutputTypeFlags inFlags, const char *inFilename ); static void DebugFPrintFPrint( char *inData, size_t inSize ); #endif // iDebug (Mac OS X user and kernel) - #if ( DEBUG_IDEBUG_ENABLED ) static OSStatus DebugiDebugInit( void ); static void DebugiDebugPrint( char *inData, size_t inSize ); #endif // kprintf (Mac OS X Kernel) - #if ( DEBUG_KPRINTF_ENABLED ) static void DebugKPrintFPrint( char *inData, size_t inSize ); #endif // Mac OS X IOLog (Mac OS X Kernel) - #if ( DEBUG_MAC_OS_X_IOLOG_ENABLED ) static void DebugMacOSXIOLogPrint( char *inData, size_t inSize ); #endif // Mac OS X Log - #if ( TARGET_OS_MAC ) static OSStatus DebugMacOSXLogInit( void ); static void DebugMacOSXLogPrint( char *inData, size_t inSize ); #endif // Windows Debugger - #if ( TARGET_OS_WIN32 ) static void DebugWindowsDebuggerPrint( char *inData, size_t inSize ); #endif // Windows Event Log - #if ( TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE ) static OSStatus DebugWindowsEventLogInit( const char *inName, HMODULE inModule ); static void DebugWindowsEventLogPrint( DebugLevel inLevel, char *inData, size_t inSize ); #endif // DebugLib support - #if ( DEBUG_CORE_SERVICE_ASSERTS_ENABLED ) static pascal void DebugAssertOutputHandler( @@ -145,7 +130,6 @@ DebugAssertOutputHandler( #endif // Utilities - static char * DebugNumVersionToString( uint32_t inVersion, char *inString ); #if ( TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE ) @@ -166,10 +150,8 @@ DebugWinCharToTCharString( #pragma mark == Globals == #endif -//=========================================================================================================================== -// Private Globals -//=========================================================================================================================== +// Private Globals #if ( TARGET_OS_VXWORKS ) // TCP States for inetstatShow. @@ -192,7 +174,6 @@ const char * kDebugTCPStates[] = #endif // General - static bool gDebugInitialized = false; static DebugOutputType gDebugOutputType = kDebugOutputTypeNone; static DebugLevel gDebugPrintLevelMin = kDebugLevelInfo; @@ -203,7 +184,6 @@ static DebugAssertOutputHandlerUPP gDebugAssertOutputHandlerUPP = NULL; #endif // Custom - static DebugOutputFunctionPtr gDebugCustomOutputFunction = NULL; static void * gDebugCustomOutputContext = NULL; @@ -214,7 +194,6 @@ static FILE * gDebugFPrintFFile = NULL; #endif // MacOSXLog - #if ( TARGET_OS_MAC ) typedef int ( *DebugMacOSXLogFunctionPtr )( const char *inFormat, ... ); @@ -222,8 +201,6 @@ static DebugMacOSXLogFunctionPtr gDebugMacOSXLogFunction = NULL; #endif // WindowsEventLog - - #if ( TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE ) static HANDLE gDebugWindowsEventLogEventSource = NULL; #endif @@ -233,10 +210,8 @@ static HANDLE gDebugWindowsEventLogEventSource = NULL; #pragma mark == General == #endif -//=========================================================================================================================== -// DebugInitialize -//=========================================================================================================================== +// DebugInitialize DEBUG_EXPORT OSStatus DebugInitialize( DebugOutputType inType, ... ) { OSStatus err; @@ -302,8 +277,7 @@ DEBUG_EXPORT OSStatus DebugInitialize( DebugOutputType inType, ... ) #endif } - // Process output kind. - + // Process output kind gDebugOutputType = type; switch( type ) { @@ -396,10 +370,8 @@ exit: return( err ); } -//=========================================================================================================================== -// DebugFinalize -//=========================================================================================================================== +// DebugFinalize DEBUG_EXPORT void DebugFinalize( void ) { #if ( DEBUG_CORE_SERVICE_ASSERTS_ENABLED ) @@ -413,10 +385,8 @@ DEBUG_EXPORT void DebugFinalize( void ) #endif } -//=========================================================================================================================== -// DebugGetProperty -//=========================================================================================================================== +// DebugGetProperty DEBUG_EXPORT OSStatus DebugGetProperty( DebugPropertyTag inTag, ... ) { OSStatus err; @@ -452,10 +422,8 @@ DEBUG_EXPORT OSStatus DebugGetProperty( DebugPropertyTag inTag, ... ) return( err ); } -//=========================================================================================================================== -// DebugSetProperty -//=========================================================================================================================== +// DebugSetProperty DEBUG_EXPORT OSStatus DebugSetProperty( DebugPropertyTag inTag, ... ) { OSStatus err; @@ -496,10 +464,8 @@ DEBUG_EXPORT OSStatus DebugSetProperty( DebugPropertyTag inTag, ... ) #pragma mark == Output == #endif -//=========================================================================================================================== -// DebugPrintF -//=========================================================================================================================== +// DebugPrintF DEBUG_EXPORT size_t DebugPrintF( DebugLevel inLevel, const char *inFormat, ... ) { va_list args; @@ -521,10 +487,8 @@ exit: return( n ); } -//=========================================================================================================================== -// DebugPrintFVAList -//=========================================================================================================================== +// DebugPrintFVAList DEBUG_EXPORT size_t DebugPrintFVAList( DebugLevel inLevel, const char *inFormat, va_list inArgs ) { size_t n; @@ -545,10 +509,8 @@ exit: return( n ); } -//=========================================================================================================================== -// DebugPrint -//=========================================================================================================================== +// DebugPrint static OSStatus DebugPrint( DebugLevel inLevel, char *inData, size_t inSize ) { OSStatus err; @@ -645,15 +607,13 @@ exit: return( err ); } -//=========================================================================================================================== -// DebugPrintAssert -// -// Warning: This routine relies on several of the strings being string constants that will exist forever because the -// underlying logMsg API that does the printing is asynchronous so it cannot use temporary/stack-based -// pointer variables (e.g. local strings). The debug macros that invoke this function only use constant -// constant strings, but if this function is invoked directly from other places, it must use constant strings. -//=========================================================================================================================== +// DebugPrintAssert + +// Warning: This routine relies on several of the strings being string constants that will exist forever because the +// underlying logMsg API that does the printing is asynchronous so it cannot use temporary/stack-based +// pointer variables (e.g. local strings). The debug macros that invoke this function only use constant +// constant strings, but if this function is invoked directly from other places, it must use constant strings. DEBUG_EXPORT void DebugPrintAssert( int_least32_t inErrorCode, @@ -664,7 +624,6 @@ DebugPrintAssert( const char * inFunction ) { // Skip if the level is not in the enabled range.. - if( ( kDebugLevelAssert < gDebugPrintLevelMin ) || ( kDebugLevelAssert > gDebugPrintLevelMax ) ) { return; @@ -698,8 +657,7 @@ DebugPrintAssert( inFunction ? inFunction : "" ); } - // Break into the debugger if enabled. - + // Break into the debugger if enabled #if ( TARGET_OS_WIN32 ) if( gDebugBreakLevel <= kDebugLevelAssert ) { @@ -716,10 +674,8 @@ DebugPrintAssert( #endif #if ( DEBUG_FPRINTF_ENABLED ) -//=========================================================================================================================== -// DebugFPrintFInit -//=========================================================================================================================== +// DebugFPrintFInit static OSStatus DebugFPrintFInit( DebugOutputTypeFlags inFlags, const char *inFilename ) { OSStatus err; @@ -760,17 +716,14 @@ exit: return( err ); } -//=========================================================================================================================== -// DebugFPrintFPrint -//=========================================================================================================================== +// DebugFPrintFPrint static void DebugFPrintFPrint( char *inData, size_t inSize ) { char * p; char * q; // Convert \r to \n. fprintf will interpret \n and convert to whatever is appropriate for the platform. - p = inData; q = p + inSize; while( p < q ) @@ -783,7 +736,6 @@ static void DebugFPrintFPrint( char *inData, size_t inSize ) } // Write the data and flush. - if( gDebugFPrintFFile ) { fprintf( gDebugFPrintFFile, "%.*s", (int) inSize, inData ); @@ -793,10 +745,8 @@ static void DebugFPrintFPrint( char *inData, size_t inSize ) #endif // DEBUG_FPRINTF_ENABLED #if ( DEBUG_IDEBUG_ENABLED ) -//=========================================================================================================================== -// DebugiDebugInit -//=========================================================================================================================== +// DebugiDebugInit static OSStatus DebugiDebugInit( void ) { OSStatus err; @@ -807,7 +757,6 @@ static OSStatus DebugiDebugInit( void ) // Emulate the iDebugSetOutputType macro in iDebugServices.h. // Note: This is not thread safe, but neither is iDebugServices.h nor iDebugKext. - if( !_giDebugReserved1 ) { _giDebugReserved1 = (uint32_t *) IOMalloc( sizeof( uint32_t ) ); @@ -828,10 +777,8 @@ exit: return( err ); } -//=========================================================================================================================== -// DebugiDebugPrint -//=========================================================================================================================== +// DebugiDebugPrint static void DebugiDebugPrint( char *inData, size_t inSize ) { #if ( TARGET_API_MAC_OSX_KERNEL ) @@ -861,10 +808,8 @@ static void DebugiDebugPrint( char *inData, size_t inSize ) #endif #if ( DEBUG_KPRINTF_ENABLED ) -//=========================================================================================================================== -// DebugKPrintFPrint -//=========================================================================================================================== +// DebugKPrintFPrint static void DebugKPrintFPrint( char *inData, size_t inSize ) { extern void kprintf( const char *inFormat, ... ); @@ -874,10 +819,8 @@ static void DebugKPrintFPrint( char *inData, size_t inSize ) #endif #if ( DEBUG_MAC_OS_X_IOLOG_ENABLED ) -//=========================================================================================================================== -// DebugMacOSXIOLogPrint -//=========================================================================================================================== +// DebugMacOSXIOLogPrint static void DebugMacOSXIOLogPrint( char *inData, size_t inSize ) { extern void IOLog( const char *inFormat, ... ); @@ -887,10 +830,8 @@ static void DebugMacOSXIOLogPrint( char *inData, size_t inSize ) #endif #if ( TARGET_OS_MAC ) -//=========================================================================================================================== -// DebugMacOSXLogInit -//=========================================================================================================================== +// DebugMacOSXLogInit static OSStatus DebugMacOSXLogInit( void ) { OSStatus err; @@ -932,10 +873,7 @@ exit: return( err ); } -//=========================================================================================================================== -// DebugMacOSXLogPrint -//=========================================================================================================================== - +// DebugMacOSXLogPrint static void DebugMacOSXLogPrint( char *inData, size_t inSize ) { if( gDebugMacOSXLogFunction ) @@ -946,10 +884,8 @@ static void DebugMacOSXLogPrint( char *inData, size_t inSize ) #endif #if ( TARGET_OS_WIN32 ) -//=========================================================================================================================== -// DebugWindowsDebuggerPrint -//=========================================================================================================================== +// DebugWindowsDebuggerPrint void DebugWindowsDebuggerPrint( char *inData, size_t inSize ) { TCHAR buffer[ 512 ]; @@ -960,7 +896,6 @@ void DebugWindowsDebuggerPrint( char *inData, size_t inSize ) // Copy locally and null terminate the string. This also converts from char to TCHAR in case we are // building with UNICODE enabled since the input is always char. Also convert \r to \n in the process. - src = inData; if( inSize >= sizeof_array( buffer ) ) { @@ -980,16 +915,13 @@ void DebugWindowsDebuggerPrint( char *inData, size_t inSize ) *dst = 0; // Print out the string to the debugger. - OutputDebugString( buffer ); } #endif #if ( TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE ) -//=========================================================================================================================== -// DebugWindowsEventLogInit -//=========================================================================================================================== +// DebugWindowsEventLogInit static OSStatus DebugWindowsEventLogInit( const char *inName, HMODULE inModule ) { OSStatus err; @@ -1004,7 +936,6 @@ static OSStatus DebugWindowsEventLogInit( const char *inName, HMODULE inModule ) key = NULL; // Use a default name if needed then convert the name to TCHARs so it works on ANSI or Unicode builds. - if( !inName || ( *inName == '\0' ) ) { inName = "DefaultApp"; @@ -1012,18 +943,15 @@ static OSStatus DebugWindowsEventLogInit( const char *inName, HMODULE inModule ) DebugWinCharToTCharString( inName, kSizeCString, name, sizeof( name ), NULL ); // Build the path string using the fixed registry path and app name. - src = "SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\"; DebugWinCharToTCharString( src, kSizeCString, path, sizeof_array( path ), &size ); DebugWinCharToTCharString( inName, kSizeCString, path + size, sizeof_array( path ) - size, NULL ); // Add/Open the source name as a sub-key under the Application key in the EventLog registry key. - err = RegCreateKeyEx( HKEY_LOCAL_MACHINE, path, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &key, NULL ); require_noerr_quiet( err, exit ); // Set the path in the EventMessageFile subkey. Add 1 to the TCHAR count to include the null terminator. - n = GetModuleFileName( inModule, path, sizeof_array( path ) ); err = translate_errno( n > 0, (OSStatus) GetLastError(), kParamErr ); require_noerr_quiet( err, exit ); @@ -1034,14 +962,12 @@ static OSStatus DebugWindowsEventLogInit( const char *inName, HMODULE inModule ) require_noerr_quiet( err, exit ); // Set the supported event types in the TypesSupported subkey. - typesSupported = EVENTLOG_SUCCESS | EVENTLOG_ERROR_TYPE | EVENTLOG_WARNING_TYPE | EVENTLOG_INFORMATION_TYPE | EVENTLOG_AUDIT_SUCCESS | EVENTLOG_AUDIT_FAILURE; err = RegSetValueEx( key, TEXT( "TypesSupported" ), 0, REG_DWORD, (const LPBYTE) &typesSupported, sizeof( DWORD ) ); require_noerr_quiet( err, exit ); // Set up the event source. - gDebugWindowsEventLogEventSource = RegisterEventSource( NULL, name ); err = translate_errno( gDebugWindowsEventLogEventSource, (OSStatus) GetLastError(), kParamErr ); require_noerr_quiet( err, exit ); @@ -1054,10 +980,8 @@ exit: return( err ); } -//=========================================================================================================================== -// DebugWindowsEventLogPrint -//=========================================================================================================================== +// DebugWindowsEventLogPrint static void DebugWindowsEventLogPrint( DebugLevel inLevel, char *inData, size_t inSize ) { WORD type; @@ -1068,8 +992,7 @@ static void DebugWindowsEventLogPrint( DebugLevel inLevel, char *inData, size_t char c; const TCHAR * array[ 1 ]; - // Map the debug level to a Windows EventLog type. - + // Map the debug level to a Windows EventLog type if( inLevel <= kDebugLevelNotice ) { type = EVENTLOG_INFORMATION_TYPE; @@ -1085,7 +1008,6 @@ static void DebugWindowsEventLogPrint( DebugLevel inLevel, char *inData, size_t // Copy locally and null terminate the string. This also converts from char to TCHAR in case we are // building with UNICODE enabled since the input is always char. Also convert \r to \n in the process. - src = inData; if( inSize >= sizeof_array( buffer ) ) { @@ -1105,7 +1027,6 @@ static void DebugWindowsEventLogPrint( DebugLevel inLevel, char *inData, size_t *dst = 0; // Add the the string to the event log. - array[ 0 ] = buffer; if( gDebugWindowsEventLogEventSource ) { @@ -1115,10 +1036,8 @@ static void DebugWindowsEventLogPrint( DebugLevel inLevel, char *inData, size_t #endif // TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE #if ( DEBUG_CORE_SERVICE_ASSERTS_ENABLED ) -//=========================================================================================================================== -// DebugAssertOutputHandler -//=========================================================================================================================== +// DebugAssertOutputHandler static pascal void DebugAssertOutputHandler( OSType inComponentSignature, @@ -1146,28 +1065,28 @@ DebugAssertOutputHandler( #pragma mark == Utilities == #endif -//=========================================================================================================================== -// DebugSNPrintF -// -// Stolen from mDNS.c's mDNS_snprintf/mDNS_vsnprintf with the following changes: -// -// Changed names to avoid name collisions with the mDNS versions. -// Changed types to standard C types since mDNSEmbeddedAPI.h may not be available. -// Conditionalized mDNS stuff so it can be used with or with mDNSEmbeddedAPI.h. -// Added 64-bit support for %d (%lld), %i (%lli), %u (%llu), %o (%llo), %x (%llx), and %b (%llb). -// Added %@ - Cocoa/CoreFoundation object. Param is the object. Strings are used directly. Others use CFCopyDescription. -// Added %.8a - FIbre Channel address. Arg=ptr to address. -// Added %##a - IPv4 (if AF_INET defined) or IPv6 (if AF_INET6 defined) sockaddr. Arg=ptr to sockaddr. -// Added %b - Binary representation of integer (e.g. 01101011). Modifiers and arg=the same as %d, %x, etc. -// Added %C - Mac-style FourCharCode (e.g. 'APPL'). Arg=32-bit value to print as a Mac-style FourCharCode. -// Added %H - Hex Dump (e.g. "\x6b\xa7" -> "6B A7"). 1st arg=ptr, 2nd arg=size, 3rd arg=max size. -// Added %#H - Hex Dump & ASCII (e.g. "\x41\x62" -> "6B A7 'Ab'"). 1st arg=ptr, 2nd arg=size, 3rd arg=max size. -// Added %m - Error Message (e.g. 0 -> "kNoErr"). Modifiers and error code args are the same as %d, %x, etc. -// Added %S - UTF-16 string. Host order if no BOM. Precision is UTF-16 char count. BOM counts in any precision. Arg=ptr. -// Added %#S - Big Endian UTF-16 string (unless BOM overrides). Otherwise the same as %S. -// Added %##S - Little Endian UTF-16 string (unless BOM overrides). Otherwise the same as %S. -// Added %U - Universally Unique Identifier (UUID) (e.g. 6ba7b810-9dad-11d1-80b4-00c04fd430c8). Arg=ptr to 16-byte UUID. -//=========================================================================================================================== + +// DebugSNPrintF + +// Stolen from mDNS.c's mDNS_snprintf/mDNS_vsnprintf with the following changes: + +// Changed names to avoid name collisions with the mDNS versions. +// Changed types to standard C types since mDNSEmbeddedAPI.h may not be available. +// Conditionalized mDNS stuff so it can be used with or with mDNSEmbeddedAPI.h. +// Added 64-bit support for %d (%lld), %i (%lli), %u (%llu), %o (%llo), %x (%llx), and %b (%llb). +// Added %@ - Cocoa/CoreFoundation object. Param is the object. Strings are used directly. Others use CFCopyDescription. +// Added %.8a - FIbre Channel address. Arg=ptr to address. +// Added %##a - IPv4 (if AF_INET defined) or IPv6 (if AF_INET6 defined) sockaddr. Arg=ptr to sockaddr. +// Added %b - Binary representation of integer (e.g. 01101011). Modifiers and arg=the same as %d, %x, etc. +// Added %C - Mac-style FourCharCode (e.g. 'APPL'). Arg=32-bit value to print as a Mac-style FourCharCode. +// Added %H - Hex Dump (e.g. "\x6b\xa7" -> "6B A7"). 1st arg=ptr, 2nd arg=size, 3rd arg=max size. +// Added %#H - Hex Dump & ASCII (e.g. "\x41\x62" -> "6B A7 'Ab'"). 1st arg=ptr, 2nd arg=size, 3rd arg=max size. +// Added %m - Error Message (e.g. 0 -> "kNoErr"). Modifiers and error code args are the same as %d, %x, etc. +// Added %S - UTF-16 string. Host order if no BOM. Precision is UTF-16 char count. BOM counts in any precision. Arg=ptr. +// Added %#S - Big Endian UTF-16 string (unless BOM overrides). Otherwise the same as %S. +// Added %##S - Little Endian UTF-16 string (unless BOM overrides). Otherwise the same as %S. +// Added %U - Universally Unique Identifier (UUID) (e.g. 6ba7b810-9dad-11d1-80b4-00c04fd430c8). Arg=ptr to 16-byte UUID. + DEBUG_EXPORT size_t DebugSNPrintF(char *sbuffer, size_t buflen, const char *fmt, ...) { @@ -1181,9 +1100,9 @@ DEBUG_EXPORT size_t DebugSNPrintF(char *sbuffer, size_t buflen, const char *fmt, return(length); } -//=========================================================================================================================== -// DebugSNPrintFVAList - va_list version of DebugSNPrintF. See DebugSNPrintF for more info. -//=========================================================================================================================== + +// DebugSNPrintFVAList - va_list version of DebugSNPrintF. See DebugSNPrintF for more info. + DEBUG_EXPORT size_t DebugSNPrintFVAList(char *sbuffer, size_t buflen, const char *fmt, va_list arg) { @@ -1607,9 +1526,9 @@ exit: return(nwritten); } -//=========================================================================================================================== -// DebugGetErrorString -//=========================================================================================================================== + +// DebugGetErrorString + DEBUG_EXPORT const char * DebugGetErrorString( int_least32_t inErrorCode, char *inBuffer, size_t inBufferSize ) { @@ -2014,9 +1933,9 @@ DEBUG_EXPORT const char * DebugGetErrorString( int_least32_t inErrorCode, char return( s ); } -//=========================================================================================================================== -// DebugHexDump -//=========================================================================================================================== + +// DebugHexDump + DEBUG_EXPORT size_t DebugHexDump( @@ -2139,12 +2058,12 @@ DebugHexDump( } // Build the prefix string. It will be in one of the following formats: - // + // 1) "00000000+0000[0000]" (address and offset) // 2) "00000000" (address only) // 3) "0000[0000]" (offset only) // 4) "" (no address or offset) - // + // Note: If we're printing multiple "lines", but not printing newlines, a space is used to separate. s = prefixString; @@ -2375,9 +2294,9 @@ DebugHexDump( return( (size_t)( dst - outBuffer ) ); } -//=========================================================================================================================== -// DebugNumVersionToString -//=========================================================================================================================== + +// DebugNumVersionToString + static char * DebugNumVersionToString( uint32_t inVersion, char *inString ) { @@ -2440,9 +2359,9 @@ static char * DebugNumVersionToString( uint32_t inVersion, char *inString ) return( inString ); } -//=========================================================================================================================== -// DebugTaskLevel -//=========================================================================================================================== + +// DebugTaskLevel + DEBUG_EXPORT uint32_t DebugTaskLevel( void ) { @@ -2461,9 +2380,9 @@ DEBUG_EXPORT uint32_t DebugTaskLevel( void ) } #if ( TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE ) -//=========================================================================================================================== -// DebugWinEnableConsole -//=========================================================================================================================== + +// DebugWinEnableConsole + #pragma warning( disable:4311 ) @@ -2547,9 +2466,9 @@ exit: #endif // TARGET_OS_WIN32 && !TARGET_OS_WINDOWS_CE #if ( TARGET_OS_WIN32 ) -//=========================================================================================================================== -// DebugWinCharToTCharString -//=========================================================================================================================== + +// DebugWinCharToTCharString + static TCHAR * DebugWinCharToTCharString( @@ -2597,9 +2516,9 @@ DebugWinCharToTCharString( #pragma mark == Debugging == #endif -//=========================================================================================================================== -// DebugServicesTest -//=========================================================================================================================== + +// DebugServicesTest + DEBUG_EXPORT OSStatus DebugServicesTest( void ) { diff --git a/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.h b/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.h index cb0ef4d1acae..97ac12bccd36 100755 --- a/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.h +++ b/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.h @@ -15,7 +15,7 @@ * limitations under the License. */ -//--------------------------------------------------------------------------------------------------------------------------- + /*! @header DebugServices Debugging Library @@ -36,9 +36,9 @@ #pragma mark == Settings == #endif -//=========================================================================================================================== + // Settings -//=========================================================================================================================== + // General @@ -90,7 +90,7 @@ #pragma mark == Output == #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined DEBUG_FPRINTF_ENABLED @abstract Enables ANSI C fprintf output. @@ -108,7 +108,7 @@ #endif #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined DEBUG_MAC_OS_X_IOLOG_ENABLED @abstract Enables IOLog (Mac OS X Kernel) output. @@ -118,7 +118,7 @@ #define DEBUG_MAC_OS_X_IOLOG_ENABLED TARGET_API_MAC_OSX_KERNEL #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined DEBUG_KPRINTF_ENABLED @abstract Enables kprintf (Mac OS X Kernel) output. @@ -128,7 +128,7 @@ #define DEBUG_KPRINTF_ENABLED TARGET_API_MAC_OSX_KERNEL #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined DEBUG_IDEBUG_ENABLED @abstract Enables iDebug (Mac OS X user and Kernel) output. @@ -144,7 +144,7 @@ #define DEBUG_IDEBUG_ENABLED TARGET_API_MAC_OSX_KERNEL #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined DEBUG_CORE_SERVICE_ASSERTS_ENABLED @abstract Controls whether Core Services assert handling is enabled. Enabling requires CoreServices framework. @@ -158,7 +158,7 @@ #endif #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @typedef DebugOutputType @abstract Type of debug output (i.e. where the output goes). @@ -177,7 +177,7 @@ typedef uint32_t DebugOutputType; #define kDebugOutputTypeWindowsEventLog 0x7765766CU // 'wevl' - 1st param = C-string name, 2nd param = HMODULE or NULL. // Console meta output kind - Any kind of Console output (in horizontal order of preference): -// + // Mac OS X = ANSI printf (viewable in Console.app) // Mac OS X Kernel = IOLog (/var/log/system.log) or kprintf (serial). // Windows = ANSI printf (Console window) or OutputDebugString (debugger). @@ -185,7 +185,7 @@ typedef uint32_t DebugOutputType; #define kDebugOutputTypeMetaConsole 0x434F4E53U // 'CONS' - no params -//--------------------------------------------------------------------------------------------------------------------------- + /*! @typedef DebugOutputTypeFlags @abstract Flags controlling how the output type is configured. @@ -203,7 +203,7 @@ typedef unsigned int DebugOutputTypeFlags; #define kDebugOutputTypeFlagsStdErr 2 #define kDebugOutputTypeFlagsFile 10 -//--------------------------------------------------------------------------------------------------------------------------- + /*! @typedef DebugOutputFunctionPtr @abstract Function ptr for a custom callback to print debug output. @@ -211,15 +211,15 @@ typedef unsigned int DebugOutputTypeFlags; typedef void ( *DebugOutputFunctionPtr )( char *inData, size_t inSize, void *inContext ); -//=========================================================================================================================== + // Constants -//=========================================================================================================================== + #if 0 #pragma mark == Flags == #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @typedef DebugFlags @abstract Flags controlling how output is printed. @@ -239,7 +239,7 @@ typedef uint32_t DebugFlags; #define kDebugFlagsNo16ByteHexPad ( 1 << 8 ) #define kDebugFlagsNoByteCount ( 1 << 9 ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @enum DebugTaskLevelFlags @abstract Flags indicating the task level. @@ -268,11 +268,11 @@ enum #pragma mark == Levels == #endif -//=========================================================================================================================== + // Constants & Types - Levels -//=========================================================================================================================== -//--------------------------------------------------------------------------------------------------------------------------- + + /*! @typedef DebugLevel @abstract Level used to control debug logging. @@ -304,7 +304,7 @@ typedef int32_t DebugLevel; #define kDebugLevelFlagStackTrace 0x00010000 #define kDebugLevelFlagDebugBreak 0x00020000 -//--------------------------------------------------------------------------------------------------------------------------- + /*! @typedef LogLevel @abstract Level used to control which events are logged. @@ -333,7 +333,7 @@ typedef int32_t LogLevel; #pragma mark == Properties == #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @typedef DebugPropertyTag @abstract Tag for properties. @@ -355,7 +355,7 @@ typedef uint32_t DebugPropertyTag; #pragma mark == General macros == #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined DEBUG_UNUSED @abstract Macro to mark a paramter as unused to avoid unused parameter warnings. @@ -368,7 +368,7 @@ typedef uint32_t DebugPropertyTag; #define DEBUG_UNUSED( X ) (void)( X ) -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined DEBUG_USE_ONLY @abstract Macro to mark a variable as used only when debugging is enabled. @@ -386,7 +386,7 @@ typedef uint32_t DebugPropertyTag; #define DEBUG_USE_ONLY( X ) (void)( X ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined DEBUG_LOCAL @abstract Macros to make variables and functions static when debugging is off, but extern when debugging is on. @@ -403,7 +403,7 @@ typedef uint32_t DebugPropertyTag; #define DEBUG_LOCAL static #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined DEBUG_STATIC @abstract Macros to make variables and functions static when debugging is off, but extern when debugging is on. @@ -420,7 +420,7 @@ typedef uint32_t DebugPropertyTag; #define DEBUG_STATIC static #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined DEBUG_EXPORT @abstract Macros to export variables. @@ -438,7 +438,7 @@ typedef uint32_t DebugPropertyTag; #define DEBUG_EXPORT extern #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined debug_add @abstract Macro to add (or subtract if negative) a value when debugging is on. Does nothing if debugging is off. @@ -450,7 +450,7 @@ typedef uint32_t DebugPropertyTag; #define debug_add( A, B ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined debug_perform @abstract Macro to perform something in debug-only builds. @@ -462,7 +462,7 @@ typedef uint32_t DebugPropertyTag; #define debug_perform( X ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function translate_errno @abstract Returns 0 if the test success. If the test fails, returns errno if non-zero and othewise the alternate error. @@ -474,7 +474,7 @@ typedef uint32_t DebugPropertyTag; #pragma mark == Compile Time macros == #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined check_compile_time @abstract Performs a compile-time check of something such as the size of an int. @@ -502,7 +502,7 @@ typedef uint32_t DebugPropertyTag; #define check_compile_time( X ) extern int debug_compile_time_name[ ( X ) ? 1 : -1 ] -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined check_compile_time_code @abstract Perform a compile-time check, suitable for placement in code, of something such as the size of an int. @@ -533,7 +533,7 @@ typedef uint32_t DebugPropertyTag; #pragma mark == check macros == #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined check @abstract Check that an expression is true (non-zero). @@ -564,7 +564,7 @@ typedef uint32_t DebugPropertyTag; #endif #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined check_string @abstract Check that an expression is true (non-zero) with an explanation. @@ -596,7 +596,7 @@ typedef uint32_t DebugPropertyTag; #endif #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined check_noerr @abstract Check that an error code is noErr (0). @@ -631,7 +631,7 @@ typedef uint32_t DebugPropertyTag; #endif #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined check_noerr_string @abstract Check that an error code is noErr (0) with an explanation. @@ -666,7 +666,7 @@ typedef uint32_t DebugPropertyTag; #endif #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined check_translated_errno @abstract Check a condition and prints errno (if non-zero) to the log. @@ -696,7 +696,7 @@ typedef uint32_t DebugPropertyTag; #endif #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined check_ptr_overlap @abstract Checks that two ptrs do not overlap. @@ -716,7 +716,7 @@ typedef uint32_t DebugPropertyTag; #pragma mark == require macros == #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined require @abstract Requires that an expression evaluate to true. @@ -743,7 +743,7 @@ typedef uint32_t DebugPropertyTag; } while( 0 ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined require_string @abstract Requires that an expression evaluate to true with an explanation. @@ -770,7 +770,7 @@ typedef uint32_t DebugPropertyTag; } while( 0 ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined require_quiet @abstract Requires that an expression evaluate to true. @@ -795,7 +795,7 @@ typedef uint32_t DebugPropertyTag; } while( 0 ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined require_noerr @abstract Require that an error code is noErr (0). @@ -825,7 +825,7 @@ typedef uint32_t DebugPropertyTag; } while( 0 ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined require_noerr_string @abstract Require that an error code is noErr (0). @@ -856,7 +856,7 @@ typedef uint32_t DebugPropertyTag; } while( 0 ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined require_noerr_action_string @abstract Require that an error code is noErr (0). @@ -888,7 +888,7 @@ typedef uint32_t DebugPropertyTag; } while( 0 ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined require_noerr_quiet @abstract Require that an error code is noErr (0). @@ -913,7 +913,7 @@ typedef uint32_t DebugPropertyTag; } while( 0 ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined require_noerr_action @abstract Require that an error code is noErr (0) with an action to execute otherwise. @@ -944,7 +944,7 @@ typedef uint32_t DebugPropertyTag; } while( 0 ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined require_noerr_action_quiet @abstract Require that an error code is noErr (0) with an action to execute otherwise. @@ -970,7 +970,7 @@ typedef uint32_t DebugPropertyTag; } while( 0 ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined require_action @abstract Requires that an expression evaluate to true with an action to execute otherwise. @@ -998,7 +998,7 @@ typedef uint32_t DebugPropertyTag; } while( 0 ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined require_action_quiet @abstract Requires that an expression evaluate to true with an action to execute otherwise. @@ -1024,7 +1024,7 @@ typedef uint32_t DebugPropertyTag; } while( 0 ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined require_action_string @abstract Requires that an expression evaluate to true with an explanation and action to execute otherwise. @@ -1054,7 +1054,7 @@ typedef uint32_t DebugPropertyTag; #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined require_throw @abstract Requires that an expression evaluates to true or an exception is thrown. @@ -1082,9 +1082,9 @@ typedef uint32_t DebugPropertyTag; #pragma mark == Design-By-Contract macros == #endif -//=========================================================================================================================== + // Design-By-Contract macros -//=========================================================================================================================== + #define ensure( X ) check( X ) #define ensure_string( X, STR ) check_string( X, STR ) @@ -1098,9 +1098,9 @@ typedef uint32_t DebugPropertyTag; #pragma mark == Expect macros == #endif -//=========================================================================================================================== + // Expect macros -//=========================================================================================================================== + // Expect macros allow code to include runtime checking of things that should not happen in shipping code (e.g. internal // programmer errors, such as a NULL parameter where it is not allowed). Once the code has been verified to work correctly @@ -1139,7 +1139,7 @@ typedef uint32_t DebugPropertyTag; #pragma mark == Output macros == #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined debug_string @abstract Prints a debugging C string. @@ -1161,7 +1161,7 @@ typedef uint32_t DebugPropertyTag; #endif #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined debug_print_assert @abstract Prints an assertion. @@ -1174,7 +1174,7 @@ typedef uint32_t DebugPropertyTag; #define debug_print_assert( ERROR_CODE, ASSERT_STRING, MESSAGE, FILENAME, LINE_NUMBER, FUNCTION ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined dlog @abstract Prints a debug-only message. @@ -1198,7 +1198,7 @@ typedef uint32_t DebugPropertyTag; #endif #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined dlogv @abstract Prints a debug-only message. @@ -1210,7 +1210,7 @@ typedef uint32_t DebugPropertyTag; #define dlogv( LEVEL, FORMAT, LIST ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined dlogmem @abstract Prints a debug-only dump of memory. @@ -1223,7 +1223,7 @@ typedef uint32_t DebugPropertyTag; #define dlogmem( LEVEL, PTR, SIZE ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined DebugNSLog @abstract Debug-only macro for the Cocoa NSLog function. @@ -1247,7 +1247,7 @@ typedef uint32_t DebugPropertyTag; #endif #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @defined DebugLogMsg @abstract Debug-only macro for the VxWorks logMsg function. @@ -1279,7 +1279,7 @@ typedef uint32_t DebugPropertyTag; extern "C" { #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function DebugInitialize @abstract Initializes the debugging library for a specific kind of output. @@ -1310,7 +1310,7 @@ DEBUG_EXPORT OSStatus DebugInitialize( DebugOutputType inType, ... ); #endif #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function DebugFinalize @abstract Releases any resources used by the debugging library @@ -1326,7 +1326,7 @@ DEBUG_EXPORT void DebugFinalize( void ); #define debug_terminate() #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function DebugGetProperty @abstract Gets the specified property from the debugging library. @@ -1354,7 +1354,7 @@ DEBUG_EXPORT OSStatus DebugGetProperty( DebugPropertyTag inTag, ... ); #endif #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function DebugSetProperty @abstract Sets the specified property from the debugging library. @@ -1386,7 +1386,7 @@ DEBUG_EXPORT OSStatus DebugSetProperty( DebugPropertyTag inTag, ... ); #pragma mark == Routines - Debugging Output == #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function DebugPrintF @abstract Prints a debug message with printf-style formatting. @@ -1406,7 +1406,7 @@ DEBUG_EXPORT OSStatus DebugSetProperty( DebugPropertyTag inTag, ... ); DEBUG_EXPORT size_t DebugPrintF( DebugLevel inLevel, const char *inFormat, ... ); #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function DebugPrintFVAList @abstract va_list version of DebugPrintF. See DebugPrintF for more info. @@ -1416,7 +1416,7 @@ DEBUG_EXPORT size_t DebugPrintF( DebugLevel inLevel, const char *inFormat, . DEBUG_EXPORT size_t DebugPrintFVAList( DebugLevel inLevel, const char *inFormat, va_list inArgs ); #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function DebugPrintAssert @abstract Prints a message describing the reason the (e.g. an assert failed), an optional error message, @@ -1457,7 +1457,7 @@ DebugPrintAssert( #pragma mark == Routines - Utilities == #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function DebugSNPrintF @abstract Debugging versions of standard C snprintf with extra features. @@ -1496,7 +1496,7 @@ DebugPrintAssert( DEBUG_EXPORT size_t DebugSNPrintF(char *sbuffer, size_t buflen, const char *fmt, ...); #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function DebugSNPrintFVAList @abstract va_list version of DebugSNPrintF. See DebugSNPrintF for more info. @@ -1506,7 +1506,7 @@ DEBUG_EXPORT size_t DebugSNPrintF(char *sbuffer, size_t buflen, const char *fmt, DEBUG_EXPORT size_t DebugSNPrintFVAList(char *sbuffer, size_t buflen, const char *fmt, va_list arg); #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function DebugGetErrorString @abstract Gets an error string from an error code. @@ -1528,7 +1528,7 @@ DEBUG_EXPORT size_t DebugSNPrintFVAList(char *sbuffer, size_t buflen, const char DEBUG_EXPORT const char * DebugGetErrorString( int_least32_t inErrorCode, char *inBuffer, size_t inBufferSize ); #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function DebugHexDump @abstract Hex dumps data to a string or to the output device. @@ -1560,7 +1560,7 @@ DebugHexDump( #define dloghex( LEVEL, INDENT, LABEL, LABEL_SIZE, LABEL_MIN_SIZE, TYPE, TYPE_SIZE, DATA_START, DATA, DATA_SIZE, FLAGS, BUFFER, BUFFER_SIZE ) #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function DebugTaskLevel @abstract Returns the current task level. @@ -1590,7 +1590,7 @@ DebugHexDump( DEBUG_EXPORT uint32_t DebugTaskLevel( void ); #endif -//--------------------------------------------------------------------------------------------------------------------------- + /*! @function DebugServicesTest @abstract Unit test. diff --git a/sd/source/ui/remotecontrol/mDNSResponder/GenLinkedList.c b/sd/source/ui/remotecontrol/mDNSResponder/GenLinkedList.c index a36183d7a61e..6007242539fb 100755 --- a/sd/source/ui/remotecontrol/mDNSResponder/GenLinkedList.c +++ b/sd/source/ui/remotecontrol/mDNSResponder/GenLinkedList.c @@ -32,7 +32,7 @@ #define ASSIGNLINK( e, l, o) ( *((void**)((char*) (e) + (o))) = (l)) -// GenLinkedList ///////////////////////////////////////////////////////////// +// GenLinkedList void InitLinkedList( GenLinkedList *pList, size_t linkOffset) /* Initialize the block of memory pointed to by pList as a linked list. */ @@ -124,7 +124,7 @@ int ReplaceElem( GenLinkedList *pList, void *elemInList, void *newElem) } -// GenDoubleLinkedList ///////////////////////////////////////////////////////// +// GenDoubleLinkedList void InitDoubleLinkedList( GenDoubleLinkedList *pList, size_t fwdLinkOffset, size_t backLinkOffset) @@ -183,7 +183,7 @@ void DLLRemoveFromList( GenDoubleLinkedList *pList, void *elem) } -// GenLinkedOffsetList ///////////////////////////////////////////////////// +// GenLinkedOffsetList // Extract the Next offset from element #define GETOFFSET( e, o) ( *(size_t*)((char*) (e) + (o)) ) diff --git a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c index 63e8f6326e1b..1c4e08463900 100755 --- a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c +++ b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c @@ -130,7 +130,7 @@ typedef void (*ProcessReplyFn)(DNSServiceOp *const sdr, const CallbackHeader *co // When using kDNSServiceFlagsShareConnection, there is one primary _DNSServiceOp_t, and zero or more subordinates // For the primary, the 'next' field points to the first subordinate, and its 'next' field points to the next, and so on. // For the primary, the 'primary' field is NULL; for subordinates the 'primary' field points back to the associated primary -// + // _DNS_SD_LIBDISPATCH is defined where libdispatch/GCD is available. This does not mean that the application will use the // DNSServiceSetDispatchQueue API. Hence any new code guarded with _DNS_SD_LIBDISPATCH should still be backwards compatible. struct _DNSServiceRef_t @@ -870,7 +870,7 @@ static void CallbackWithError(DNSServiceRef sdRef, DNSServiceErrorType error) // call the callback with a subordinate sdRef the application can call DNSServiceRefDeallocate // on the main sdRef and DNSServiceRefDeallocate handles this case by walking all the sdRefs and // clears the moreptr so that we can terminate here. - // + // If DNSServiceRefDeallocate was not called in the callback, then set moreptr to NULL so that // we don't access the stack variable after we return from this function. if (!morebytes) {syslog(LOG_WARNING, "dnssdclientstub:sdRef: CallbackwithError morebytes zero sdr %p", sdr); return;} diff --git a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.h b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.h index 37bae8a1c431..29466c1c0138 100755 --- a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.h +++ b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.h @@ -30,9 +30,9 @@ #define INCLUDED_SD_SOURCE_UI_REMOTECONTROL_MDNSRESPONDER_DNSSD_IPC_H -// + // Common cross platform services -// + #if defined(WIN32) # include <winsock2.h> #endif diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 006919aae283..aa4ae8760461 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -43,7 +43,7 @@ namespace sd { static const sal_uLong HIDE_MOUSE_TIMEOUT = 10000; static const sal_uLong SHOW_MOUSE_TIMEOUT = 1000; -// ============================================================================= + ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, ::Window* pParent ) : ::sd::Window( pParent ) diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index de376763bcba..849b2a7d36fe 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -101,7 +101,7 @@ namespace { } -////////////////////////////////////////////////////////////////////////////// + const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap() diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index eee338483171..9424c114c7d5 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -3629,7 +3629,7 @@ void PresentationSettingsEx::SetPropertyValue( const OUString& rProperty, const throw IllegalArgumentException(); } -//////////////////////////////// + // XAnimationListener diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index d4eeabb5fbe1..17584c78797a 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -87,7 +87,7 @@ class SlideShowView; class AnimationSlideController; class PaneHider; -// -------------------------------------------------------------------- + struct PresentationSettingsEx : public PresentationSettings { @@ -105,7 +105,7 @@ struct PresentationSettingsEx : public PresentationSettings void SetPropertyValue( const OUString& rProperty, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException); }; -// -------------------------------------------------------------------- + struct WrappedShapeEventImpl { @@ -118,7 +118,7 @@ struct WrappedShapeEventImpl typedef boost::shared_ptr< WrappedShapeEventImpl > WrappedShapeEventImplPtr; typedef std::map< css::uno::Reference< css::drawing::XShape >, WrappedShapeEventImplPtr > WrappedShapeEventImplMap; -// -------------------------------------------------------------------- + class SlideShowListenerProxy : private ::cppu::BaseMutex, public ::cppu::WeakImplHelper2< css::presentation::XSlideShowListener, css::presentation::XShapeEventListener > @@ -162,7 +162,7 @@ public: css::uno::Reference< css::presentation::XSlideShow > mxSlideShow; }; -// -------------------------------------------------------------------- + typedef ::cppu::WeakComponentImplHelper2< css::presentation::XSlideShowController, css::container::XIndexAccess > SlideshowImplBase; diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index 2eed17d46b69..48a782585c50 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.cxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -50,10 +50,8 @@ using namespace ::com::sun::star; namespace sd { -/////////////////////////////////////////////////////////////////////// -// SlideShowViewListeners -/////////////////////////////////////////////////////////////////////// +// SlideShowViewListeners SlideShowViewListeners::SlideShowViewListeners( ::osl::Mutex& rMutex ) : mrMutex( rMutex ) { @@ -114,10 +112,8 @@ void SlideShowViewListeners::disposing( const lang::EventObject& _rEventSource ) maListeners.clear(); } -/////////////////////////////////////////////////////////////////////// -// SlideShowViewPaintListeners -/////////////////////////////////////////////////////////////////////// +// SlideShowViewPaintListeners SlideShowViewPaintListeners::SlideShowViewPaintListeners( ::osl::Mutex& rMutex ) : SlideShowViewPaintListeners_Base( rMutex ) { @@ -130,10 +126,8 @@ bool SlideShowViewPaintListeners::implTypedNotify( const Reference< awt::XPaintL return true; // continue calling listeners } -/////////////////////////////////////////////////////////////////////// -// SlideShowViewMouseListeners -/////////////////////////////////////////////////////////////////////// +// SlideShowViewMouseListeners SlideShowViewMouseListeners::SlideShowViewMouseListeners( ::osl::Mutex& rMutex ) : SlideShowViewMouseListeners_Base( rMutex ) { @@ -164,10 +158,8 @@ bool SlideShowViewMouseListeners::implTypedNotify( const Reference< awt::XMouseL return true; // continue calling listeners } -/////////////////////////////////////////////////////////////////////// -// SlideShowViewMouseMotionListeners -/////////////////////////////////////////////////////////////////////// +// SlideShowViewMouseMotionListeners SlideShowViewMouseMotionListeners::SlideShowViewMouseMotionListeners( ::osl::Mutex& rMutex ) : SlideShowViewMouseMotionListeners_Base( rMutex ) { @@ -190,9 +182,9 @@ bool SlideShowViewMouseMotionListeners::implTypedNotify( const Reference< awt::X return true; // continue calling listeners } -/////////////////////////////////////////////////////////////////////// + // SlideShowView -/////////////////////////////////////////////////////////////////////// + SlideShowView::SlideShowView( ShowWindow& rOutputWindow, SdDrawDocument* pDoc, @@ -223,7 +215,7 @@ SlideShowView::SlideShowView( ShowWindow& rOutputWindow, mTranslationOffset.Height = 0; } -/// Dispose all internal references +// Dispose all internal references void SAL_CALL SlideShowView::dispose() throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -250,7 +242,7 @@ void SAL_CALL SlideShowView::dispose() throw (RuntimeException) WeakComponentImplHelperBase::dispose(); } -/// Disposing our broadcaster +// Disposing our broadcaster void SAL_CALL SlideShowView::disposing( const lang::EventObject& ) throw(RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx index 27d543d45257..c6d674d7117c 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.hxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx @@ -98,10 +98,8 @@ struct WrappedMouseMotionEvent : public ::com::sun::star::lang::EventObject ::com::sun::star::awt::MouseEvent maEvent; }; -/////////////////////////////////////////////////////////////////////// -// SlideShowViewListeners -/////////////////////////////////////////////////////////////////////// +// SlideShowViewListeners typedef std::vector< ::com::sun::star::uno::WeakReference< ::com::sun::star::util::XModifyListener > > ViewListenerVector; class SlideShowViewListeners { @@ -120,10 +118,8 @@ protected: typedef ::std::auto_ptr< SlideShowViewListeners > SlideShowViewListenersPtr; -/////////////////////////////////////////////////////////////////////// -// SlideShowViewPaintListeners -/////////////////////////////////////////////////////////////////////// +// SlideShowViewPaintListeners typedef ::comphelper::OListenerContainerBase< ::com::sun::star::awt::XPaintListener, ::com::sun::star::awt::PaintEvent > SlideShowViewPaintListeners_Base; @@ -137,10 +133,8 @@ protected: }; typedef ::std::auto_ptr< SlideShowViewPaintListeners > SlideShowViewPaintListenersPtr; -/////////////////////////////////////////////////////////////////////// -// SlideShowViewMouseListeners -/////////////////////////////////////////////////////////////////////// +// SlideShowViewMouseListeners typedef ::comphelper::OListenerContainerBase< ::com::sun::star::awt::XMouseListener, WrappedMouseEvent > SlideShowViewMouseListeners_Base; class SlideShowViewMouseListeners : public SlideShowViewMouseListeners_Base @@ -156,10 +150,8 @@ protected: typedef ::std::auto_ptr< SlideShowViewMouseListeners > SlideShowViewMouseListenersPtr; -/////////////////////////////////////////////////////////////////////// -// SlideShowViewMouseMotionListeners -/////////////////////////////////////////////////////////////////////// +// SlideShowViewMouseMotionListeners typedef ::comphelper::OListenerContainerBase< ::com::sun::star::awt::XMouseMotionListener, WrappedMouseMotionEvent > SlideShowViewMouseMotionListeners_Base; @@ -175,10 +167,8 @@ protected: typedef ::std::auto_ptr< SlideShowViewMouseMotionListeners > SlideShowViewMouseMotionListenersPtr; -/////////////////////////////////////////////////////////////////////// -// SlideShowView -/////////////////////////////////////////////////////////////////////// +// SlideShowView class ShowWindow; class SlideshowImpl; diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 45ae4beae044..1b73da750733 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -833,7 +833,7 @@ void TableDesignWidget::FillDesignPreviewControl() m_pValueSet->SelectItem(nSelectedItem); } -// ==================================================================== + short TableDesignDialog::Execute() { @@ -849,14 +849,14 @@ short TableDesignDialog::Execute() return RET_CANCEL; } -// ==================================================================== + ::Window * createTableDesignPanel( ::Window* pParent, ViewShellBase& rBase ) { return new TableDesignPane( pParent, rBase ); } -// ==================================================================== + void showTableDesignDialog( ::Window* pParent, ViewShellBase& rBase ) { diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx index 9ec8f454c84d..ca5394bf030d 100644 --- a/sd/source/ui/table/TableDesignPane.hxx +++ b/sd/source/ui/table/TableDesignPane.hxx @@ -43,7 +43,7 @@ class EventMultiplexerEvent; class ViewShellBase; -// -------------------------------------------------------------------- + #define CB_HEADER_ROW 0 #define CB_TOTAL_ROW 1 @@ -121,7 +121,7 @@ public: } }; -// -------------------------------------------------------------------- + class TableDesignDialog : public ModalDialog { diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index 2ec197365197..901f8b2a0c90 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -522,25 +522,25 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes return aTypeName; } -/* XServiceInfo */ +// XServiceInfo OUString SAL_CALL SdFilterDetect::getImplementationName() throw( RuntimeException ) { return impl_getStaticImplementationName(); } \ -/* XServiceInfo */ +// XServiceInfo sal_Bool SAL_CALL SdFilterDetect::supportsService( const OUString& sServiceName ) throw( RuntimeException ) { return cppu::supportsService(this, sServiceName); } -/* XServiceInfo */ +// XServiceInfo Sequence< OUString > SAL_CALL SdFilterDetect::getSupportedServiceNames() throw( RuntimeException ) { return impl_getStaticSupportedServiceNames(); } -/* Helper for XServiceInfo */ +// Helper for XServiceInfo Sequence< OUString > SdFilterDetect::impl_getStaticSupportedServiceNames() { Sequence< OUString > seqServiceNames( 1 ); @@ -548,13 +548,13 @@ Sequence< OUString > SdFilterDetect::impl_getStaticSupportedServiceNames() return seqServiceNames ; } -/* Helper for XServiceInfo */ +// Helper for XServiceInfo OUString SdFilterDetect::impl_getStaticImplementationName() { return OUString( "com.sun.star.comp.draw.FormatDetector" ); } -/* Helper for registry */ +// Helper for registry Reference< XInterface > SAL_CALL SdFilterDetect::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager ) throw( Exception ) { return static_cast< cppu::OWeakObject * >( diff --git a/sd/source/ui/unoidl/sddetect.hxx b/sd/source/ui/unoidl/sddetect.hxx index fea874b4295e..f58c1cd33f04 100644 --- a/sd/source/ui/unoidl/sddetect.hxx +++ b/sd/source/ui/unoidl/sddetect.hxx @@ -58,9 +58,9 @@ public: SFX_DECL_XSERVICEINFO_NOFACTORY - //---------------------------------------------------------------------------------- + // XExtendedFilterDetect - //---------------------------------------------------------------------------------- + virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ); }; diff --git a/sd/source/ui/unoidl/unocpres.hxx b/sd/source/ui/unoidl/unocpres.hxx index b5e7538f19c6..7e77cc2cfca1 100644 --- a/sd/source/ui/unoidl/unocpres.hxx +++ b/sd/source/ui/unoidl/unocpres.hxx @@ -30,7 +30,7 @@ #include <cppuhelper/implbase5.hxx> #include <comphelper/servicehelper.hxx> -/////////////////////////////////////////////////////////////////////////////// + class SdXImpressDocument; class SdCustomShow; @@ -94,7 +94,7 @@ public: virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); }; -// -------------------------------------------------------------------------- + #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index f0ef6b8f3140..1009ad341010 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -27,7 +27,7 @@ #include <svx/svdobj.hxx> #include <cppuhelper/supportsservice.hxx> -// folgende fuer InsertSdPage() +// following ones for InsertSdPage() #include <svx/svdlayer.hxx> #include "DrawDocShell.hxx" @@ -53,10 +53,8 @@ using namespace ::rtl; using namespace ::com::sun::star; -//============================================================================= -// class SdLayer -//============================================================================= +// class SdLayer #define WID_LAYER_LOCKED 1 #define WID_LAYER_PRINTABLE 2 #define WID_LAYER_VISIBLE 3 @@ -136,7 +134,6 @@ OUString SdLayer::convertToExternalName( const OUString& rName ) } } -/** */ SdLayer::SdLayer( SdLayerManager* pLayerManager_, SdrLayer* pSdrLayer_ ) throw() : pLayerManager(pLayerManager_) , mxLayerManager(pLayerManager_) @@ -145,7 +142,6 @@ SdLayer::SdLayer( SdLayerManager* pLayerManager_, SdrLayer* pSdrLayer_ ) throw() { } -/** */ SdLayer::~SdLayer() throw() { } @@ -304,7 +300,6 @@ void SAL_CALL SdLayer::removePropertyChangeListener( const OUString& , const uno void SAL_CALL SdLayer::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {} void SAL_CALL SdLayer::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {} -/** */ sal_Bool SdLayer::get( LayerAttribute what ) throw() { if(pLayer&&pLayerManager) @@ -402,11 +397,7 @@ void SdLayer::set( LayerAttribute what, sal_Bool flag ) throw() //TODO: uno::Exception? } - - - -//===== ::com::sun::star::container::XChild ================================= - +// ::com::sun::star::container::XChild uno::Reference<uno::XInterface> SAL_CALL SdLayer::getParent (void) throw (::com::sun::star::uno::RuntimeException) { @@ -445,18 +436,14 @@ void SAL_CALL SdLayer::removeEventListener( const uno::Reference< lang::XEventLi } -//============================================================================= -// class SdLayerManager -//============================================================================= -/** */ +// class SdLayerManager SdLayerManager::SdLayerManager( SdXImpressDocument& rMyModel ) throw() :mpModel( &rMyModel) { mpLayers = new SvUnoWeakContainer; } -/** */ SdLayerManager::~SdLayerManager() throw() { dispose(); @@ -650,7 +637,6 @@ uno::Any SAL_CALL SdLayerManager::getByIndex( sal_Int32 nLayer ) return aAny; } - // XNameAccess uno::Any SAL_CALL SdLayerManager::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 27b32360f469..f36110e80c3f 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -160,7 +160,7 @@ void SdUnoForbiddenCharsTable::Notify( SfxBroadcaster&, const SfxHint& rHint ) t } } -/////////////////////////////////////////////////////////////////////// + const sal_Int32 WID_MODEL_LANGUAGE = 1; const sal_Int32 WID_MODEL_TABSTOP = 2; @@ -2129,10 +2129,10 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r // insert the bookmark to this page into the NamedDestinations if( pPDFExtOutDevData->GetIsExportNamedDestinations() ) pPDFExtOutDevData->CreateNamedDest( aPageName, aPageRect, nPageNumber - 1 ); - // + // add the name to the outline, (almost) same code as in sc/source/ui/unoobj/docuno.cxx // issue #i40318. - // + if( pPDFExtOutDevData->GetIsExportBookmarks() ) { // Destination Export @@ -2333,9 +2333,9 @@ void SAL_CALL SdXImpressDocument::dispose() throw (::com::sun::star::uno::Runtim } } -//============================================================================= + // class SdDrawPagesAccess -//============================================================================= + SdDrawPagesAccess::SdDrawPagesAccess( SdXImpressDocument& rMyModel ) throw() : mpModel( &rMyModel) @@ -2589,9 +2589,9 @@ void SAL_CALL SdDrawPagesAccess::removeEventListener( const uno::Reference< lang OSL_FAIL( "not implemented!" ); } -//============================================================================= + // class SdMasterPagesAccess -//============================================================================= + SdMasterPagesAccess::SdMasterPagesAccess( SdXImpressDocument& rMyModel ) throw() : mpModel(&rMyModel) @@ -2841,9 +2841,9 @@ uno::Sequence< OUString > SAL_CALL SdMasterPagesAccess::getSupportedServiceNames return aSeq; } -//============================================================================= + // class SdDocLinkTargets -//============================================================================= + SdDocLinkTargets::SdDocLinkTargets( SdXImpressDocument& rMyModel ) throw() : mpModel( &rMyModel ) diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 96dcdf59821c..b18e8d0d0cc4 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -88,7 +88,7 @@ using ::com::sun::star::drawing::XShape; extern OUString getPageApiNameFromUiName( const OUString& rUIName ); extern OUString getUiNameFromPageApiNameImpl( const OUString& rApiName ); -/////////////////////////////////////////////////////////////////////// + typedef std::map<sal_uIntPtr, SfxExtItemPropertySetInfo*> SdExtPropertySetInfoCache; static SdExtPropertySetInfoCache gImplImpressPropertySetInfoCache; @@ -97,7 +97,7 @@ static SdExtPropertySetInfoCache gImplDrawPropertySetInfoCache; typedef std::map<sal_uInt32, uno::Sequence< uno::Type >*> SdTypesCache; static SdTypesCache gImplTypesCache; -/////////////////////////////////////////////////////////////////////// + #define WID_EFFECT 1 diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index d066bc8222ef..81b0a8ad0cf6 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -86,7 +86,7 @@ extern Reference< XAnnotation > createAnnotation( const Reference< XComponentCon extern Reference< XAnnotationEnumeration > createAnnotationEnumeration( const sd::AnnotationVector& ); } -/* this are the ids for page properties */ +// this are the ids for page properties enum WID_PAGE { WID_PAGE_LEFT, WID_PAGE_RIGHT, WID_PAGE_TOP, WID_PAGE_BOTTOM, WID_PAGE_WIDTH, @@ -103,7 +103,7 @@ enum WID_PAGE static sal_Char const sEmptyPageName[sizeof("page")] = "page"; -/** this function stores the property maps for draw pages in impress and draw */ +// this function stores the property maps for draw pages in impress and draw const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKind ePageKind ) { static const SfxItemPropertyMapEntry aDrawPagePropertyMap_Impl[] = @@ -1862,10 +1862,8 @@ Reference< XAnimationNode > SAL_CALL SdGenericDrawPage::getAnimationNode() throw return pSdPage->getAnimationNode(); } -//======================================================================== -// SdPageLinkTargets -//======================================================================== +// SdPageLinkTargets SdPageLinkTargets::SdPageLinkTargets( SdGenericDrawPage* pUnoPage ) throw() { mxPage = pUnoPage; @@ -1876,7 +1874,7 @@ SdPageLinkTargets::~SdPageLinkTargets() throw() { } - // XElementAccess +// XElementAccess uno::Type SAL_CALL SdPageLinkTargets::getElementType() throw(uno::RuntimeException) { @@ -2021,10 +2019,8 @@ Sequence< OUString > SAL_CALL SdPageLinkTargets::getSupportedServiceNames() return aSeq; } -//======================================================================== -// SdDrawPage -//======================================================================== +// SdDrawPage SdDrawPage::SdDrawPage( SdXImpressDocument* pModel, SdPage* pPage ) throw() : SdGenericDrawPage( pModel, pPage, ImplGetDrawPagePropertySet( pModel->IsImpressDocument(), pPage->GetPageKind() ) ) { @@ -2422,7 +2418,6 @@ Reference< drawing::XDrawPage > SAL_CALL SdDrawPage::getNotesPage() return NULL; } - // XIndexAccess sal_Int32 SAL_CALL SdDrawPage::getCount() throw(uno::RuntimeException) @@ -2674,10 +2669,7 @@ Any SdGenericDrawPage::getNavigationOrder() } } -//======================================================================== // class SdMasterPage -//======================================================================== - SdMasterPage::SdMasterPage( SdXImpressDocument* pModel, SdPage* pPage ) throw() : SdGenericDrawPage( pModel, pPage, ImplGetMasterPagePropertySet( pPage ? pPage->GetPageKind() : PK_STANDARD ) ) { diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index e8e7319b8f09..476ba6a744f4 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -941,7 +941,7 @@ void ToolBarManager::Implementation::Update ( // updated (under the assumption that our lock to the // ViewShellManager was the only one open. If that is not the // case then all should still be well but not as fast.) - // + // Note that the lock count may have been increased since // entering this method. In that case one of the next // UnlockUpdate() calls will post the UpdateCallback. diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index c82e123049f4..26d6b950e022 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -1366,13 +1366,13 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } } - /////////////////////////////////////////////////////////////////////// + // Menuoption: Change->Convert->To Bitmap, Change->Convert->To Metafile // disable, if there only Bitmap or Metafiles marked // Menuoption: Format->Area, Format->Line // disabled, if the marked objects not able to handle // these attributes - // + bool bSingleGraphicSelected = false; @@ -1487,10 +1487,10 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) rSet.DisableItem (SID_ATTR_GRAF_CROP); } - /////////////////////////////////////////////////////////////////////// + // Menuoption: Edit->Hyperlink // Disable, if there is no hyperlink - // + sal_Bool bDisableEditHyperlink = sal_True; if( mpDrawView->AreObjectsMarked() && ( mpDrawView->GetMarkedObjectList().GetMarkCount() == 1 ) ) { diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index b456f7f24bc2..ab096ecde125 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -302,7 +302,7 @@ Pointer ImageButtonHdl::GetPointer() const return Pointer( POINTER_ARROW ); } -// ==================================================================== + ChangePlaceholderTag::ChangePlaceholderTag( ::sd::View& rView, SdrObject& rPlaceholderObj ) : SmartTag( rView ) |