summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorDavid Hobley <davidh@sharpblue.org>2010-10-04 16:20:36 +0200
committerCédric Bosdonnat <cedricbosdo@openoffice.org>2010-10-04 16:20:36 +0200
commitc85da5656b3a188c0251c22070263b4de56f6a7c (patch)
tree83f33e9615ea0b823b88db3bcc886a20221946da /sfx2
parent8566ace38597cf7f8aec8b353ac9dce18493bb59 (diff)
Comment cleanup
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/inc/sfx2/linksrc.hxx4
-rw-r--r--sfx2/inc/sfx2/lnkbase.hxx4
-rw-r--r--sfx2/inc/sfx2/printopt.hxx7
-rw-r--r--sfx2/source/appl/linksrc.cxx4
-rw-r--r--sfx2/source/appl/lnkbase2.cxx3
-rw-r--r--sfx2/source/appl/sfxhelp.cxx25
-rw-r--r--sfx2/source/dialog/printopt.cxx61
7 files changed, 8 insertions, 100 deletions
diff --git a/sfx2/inc/sfx2/linksrc.hxx b/sfx2/inc/sfx2/linksrc.hxx
index 1c538112760c..a07c43426a71 100644
--- a/sfx2/inc/sfx2/linksrc.hxx
+++ b/sfx2/inc/sfx2/linksrc.hxx
@@ -44,7 +44,6 @@
namespace com { namespace sun { namespace star { namespace uno
{
class Any;
- //class Type;
}}}}
class Window;
class String;
@@ -74,7 +73,6 @@ public:
SvLinkSource();
virtual ~SvLinkSource();
-// SvBaseLink* GetDataBaseLink() const;
BOOL HasDataLinks( const SvBaseLink* = 0 ) const;
void Closed();
@@ -124,9 +122,7 @@ public:
StreamToLoadFrom getStreamToLoadFrom();
void setStreamToLoadFrom(const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream,sal_Bool bIsReadOnly );
- // --> OD 2008-06-18 #i88291#
void clearStreamToLoadFrom();
- // <--
};
SV_DECL_IMPL_REF(SvLinkSource);
diff --git a/sfx2/inc/sfx2/lnkbase.hxx b/sfx2/inc/sfx2/lnkbase.hxx
index 62e49a1592e8..2032b8f751ca 100644
--- a/sfx2/inc/sfx2/lnkbase.hxx
+++ b/sfx2/inc/sfx2/lnkbase.hxx
@@ -41,7 +41,6 @@
namespace com { namespace sun { namespace star { namespace uno
{
class Any;
- //class Type;
}}}}
namespace sfx2
@@ -170,9 +169,8 @@ public:
sal_Bool bIsReadOnly )
{ m_xInputStreamToLoadFrom = xInputStream;
m_bIsReadOnly = bIsReadOnly; }
- // --> OD 2008-06-18 #i88291#
+ // #i88291#
void clearStreamToLoadFrom();
- // <--
inline BOOL WasLastEditOK() const { return bWasLastEditOK; }
FileDialogHelper* GetFileDialog( sal_uInt32 nFlags, const String& rFactory ) const;
diff --git a/sfx2/inc/sfx2/printopt.hxx b/sfx2/inc/sfx2/printopt.hxx
index 622d69738a59..4a8fc86d4205 100644
--- a/sfx2/inc/sfx2/printopt.hxx
+++ b/sfx2/inc/sfx2/printopt.hxx
@@ -104,9 +104,8 @@ private:
SAL_DLLPRIVATE void ImplUpdateControls( const PrinterOptions* pCurrentOptions );
SAL_DLLPRIVATE void ImplSaveControls( PrinterOptions* pCurrentOptions );
- // --> OD 2008-06-25 #i63982#
+ // #i63982#
SAL_DLLPRIVATE void ImplSetAccessibleNames();
- // <--
protected:
@@ -126,10 +125,6 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
};
-// -------------------------------
-// - TransparencyPrintWarningBox -
-// -------------------------------
-
class TransparencyPrintWarningBox : public ModalDialog
{
private:
diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx
index e9fbde42328f..f2323b6daacd 100644
--- a/sfx2/source/appl/linksrc.cxx
+++ b/sfx2/source/appl/linksrc.cxx
@@ -46,7 +46,6 @@ namespace sfx2
TYPEINIT0( SvLinkSource )
-/************** class SvLinkSourceTimer *********************************/
class SvLinkSourceTimer : public Timer
{
SvLinkSource * pOwner;
@@ -209,12 +208,11 @@ void SvLinkSource::setStreamToLoadFrom(const com::sun::star::uno::Reference<com:
pImpl->m_bIsReadOnly = bIsReadOnly;
}
-// --> OD 2008-06-18 #i88291#
+// #i88291#
void SvLinkSource::clearStreamToLoadFrom()
{
pImpl->m_xInputStreamToLoadFrom.clear();
}
-// <--
void SvLinkSource::Closed()
{
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 314832e2249d..c18dca5e50e6 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -347,7 +347,7 @@ void SvBaseLink::SetUpdateMode( USHORT nMode )
}
}
-// --> OD 2008-06-19 #i88291#
+// #i88291#
void SvBaseLink::clearStreamToLoadFrom()
{
m_xInputStreamToLoadFrom.clear();
@@ -356,7 +356,6 @@ void SvBaseLink::clearStreamToLoadFrom()
xObj->clearStreamToLoadFrom();
}
}
-// <--
BOOL SvBaseLink::Update()
{
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index b9ff344a1513..7484d96b0c98 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -87,8 +87,6 @@ using namespace ::com::sun::star::lang;
#define ERROR_TAG String( DEFINE_CONST_UNICODE("Error: ") )
#define PATH_TAG String( DEFINE_CONST_UNICODE("\nPath: ") )
-// class NoHelpErrorBox --------------------------------------------------
-
class NoHelpErrorBox : public ErrorBox
{
public:
@@ -109,8 +107,6 @@ void NoHelpErrorBox::RequestHelp( const HelpEvent& )
// do nothing, because no help available
}
-// -----------------------------------------------------------------------
-
#define STARTERLIST 0
rtl::OUString HelpLocaleString()
@@ -177,17 +173,11 @@ void AppendConfigToken_Impl( String& rURL, sal_Bool bQuestionMark )
}
-// -----------------------------------------------------------------------
-
sal_Bool GetHelpAnchor_Impl( const String& _rURL, String& _rAnchor )
{
sal_Bool bRet = sal_False;
::rtl::OUString sAnchor;
- // --> OD 2009-07-01 #159496#
- // do not release solar mutex due to crash regarding accessibility
-// ULONG nSolarCount = Application::ReleaseSolarMutex();
- // <--
try
{
::ucbhelper::Content aCnt( INetURLObject( _rURL ).GetMainURL( INetURLObject::NO_DECODE ),
@@ -209,15 +199,10 @@ sal_Bool GetHelpAnchor_Impl( const String& _rURL, String& _rAnchor )
catch( ::com::sun::star::uno::Exception& )
{
}
- // --> OD 2009-07-01 #159496#
-// Application::AcquireSolarMutex( nSolarCount );
- // <--
return bRet;
}
-// -----------------------------------------------------------------------
-
class SfxHelpOptions_Impl : public utl::ConfigItem
{
private:
@@ -250,8 +235,6 @@ static Sequence< ::rtl::OUString > GetPropertyNames()
return aNames;
}
-// -----------------------------------------------------------------------
-
SfxHelpOptions_Impl::SfxHelpOptions_Impl()
: ConfigItem( ::rtl::OUString::createFromAscii("Office.SFX/Help") )
, m_pIds( NULL )
@@ -311,8 +294,6 @@ void SfxHelpOptions_Impl::Commit()
{
}
-// class SfxHelp_Impl ----------------------------------------------------
-
class SfxHelp_Impl
{
private:
@@ -412,8 +393,6 @@ sal_Bool SfxHelp_Impl::IsHelpInstalled()
return ( m_aModulesList.begin() != m_aModulesList.end() );
}
-// class SfxHelp ---------------------------------------------------------
-
SfxHelp::SfxHelp() :
bIsDebug( sal_False ),
@@ -966,9 +945,6 @@ void SfxHelp::OpenHelpAgent( ULONG nHelpId )
{
if ( SvtHelpOptions().IsHelpAgentAutoStartMode() )
{
-// SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() );
-// if ( pHelp )
-// {
SfxHelpOptions_Impl *pOpt = pImp->GetOptions();
if ( !pOpt->HasId( nHelpId ) )
return;
@@ -1002,7 +978,6 @@ void SfxHelp::OpenHelpAgent( ULONG nHelpId )
{
DBG_ERRORFILE( "OpenHelpAgent: caught an exception while executing the dispatch!" );
}
-// }
}
}
diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx
index 80902204fa88..6a818149f605 100644
--- a/sfx2/source/dialog/printopt.cxx
+++ b/sfx2/source/dialog/printopt.cxx
@@ -42,19 +42,11 @@
#include <sfx2/viewsh.hxx>
#include <sfx2/printopt.hxx>
-// -----------
-// - statics -
-// -----------
-
static USHORT aDPIArray[] = { 72, 96, 150, 200, 300, 600 };
static BOOL bOutputForPrinter = TRUE;
#define DPI_COUNT (sizeof(aDPIArray)/sizeof(aDPIArray[0 ]))
-// --------------------------------
-// - SfxCommonPrintOptionsTabPage -
-// --------------------------------
-
SfxCommonPrintOptionsTabPage::SfxCommonPrintOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) :
SfxTabPage( pParent, SfxResId( TP_COMMONPRINTOPTIONS ), rSet ),
@@ -107,8 +99,7 @@ SfxCommonPrintOptionsTabPage::SfxCommonPrintOptionsTabPage( Window* pParent, con
aReduceGradientsStripesRB.SetToggleHdl( LINK( this, SfxCommonPrintOptionsTabPage, ToggleReduceGradientsStripesRBHdl ) );
aReduceBitmapsResolutionRB.SetToggleHdl( LINK( this, SfxCommonPrintOptionsTabPage, ToggleReduceBitmapsResolutionRBHdl ) );
- // --> PB 2008-06-09 #i89164#
- // calculate dynamically the width of radiobutton and listbox
+ // #i89164# calculate dynamically the width of radiobutton and listbox
const long nOffset = 10;
Size aOldSize = aReduceBitmapsResolutionRB.GetSizePixel();
Size aNewSize = aReduceBitmapsResolutionRB.GetOptimalSize( WINDOWSIZE_PREFERRED );
@@ -123,24 +114,17 @@ SfxCommonPrintOptionsTabPage::SfxCommonPrintOptionsTabPage( Window* pParent, con
aNewSize.Width() += nOffset;
aNewSize.Height() = aOldSize.Height();
aReduceBitmapsResolutionLB.SetPosSizePixel( aPos, aNewSize );
- // <--
}
-// -----------------------------------------------------------------------------
-
SfxCommonPrintOptionsTabPage::~SfxCommonPrintOptionsTabPage()
{
}
-// -----------------------------------------------------------------------------
-
SfxTabPage* SfxCommonPrintOptionsTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
{
return( new SfxCommonPrintOptionsTabPage( pParent, rAttrSet ) );
}
-// -----------------------------------------------------------------------------
-
Window* SfxCommonPrintOptionsTabPage::GetParentLabeledBy( const Window* pWindow ) const
{
if ( pWindow == (Window *)&aReduceGradientsStepCountNF )
@@ -161,8 +145,6 @@ Window* SfxCommonPrintOptionsTabPage::GetParentLabelFor( const Window* pWindow )
return SfxTabPage::GetParentLabelFor( pWindow );
}
-// -----------------------------------------------------------------------------
-
BOOL SfxCommonPrintOptionsTabPage::FillItemSet( SfxItemSet& /*rSet*/ )
{
SvtPrintWarningOptions aWarnOptions;
@@ -187,8 +169,6 @@ BOOL SfxCommonPrintOptionsTabPage::FillItemSet( SfxItemSet& /*rSet*/ )
return bModified;
}
-// -----------------------------------------------------------------------------
-
void SfxCommonPrintOptionsTabPage::Reset( const SfxItemSet& /*rSet*/ )
{
SvtPrintWarningOptions aWarnOptions;
@@ -209,13 +189,10 @@ void SfxCommonPrintOptionsTabPage::Reset( const SfxItemSet& /*rSet*/ )
ImplUpdateControls( aPrinterOutputRB.IsChecked() ? &maPrinterOptions : &maPrintFileOptions );
- // --> OD 2008-06-25 #i63982#
+ // #i63982#
ImplSetAccessibleNames();
- // <--
}
-// -----------------------------------------------------------------------------
-
int SfxCommonPrintOptionsTabPage::DeactivatePage( SfxItemSet* pItemSet )
{
if( pItemSet )
@@ -224,8 +201,6 @@ int SfxCommonPrintOptionsTabPage::DeactivatePage( SfxItemSet* pItemSet )
return LEAVE_PAGE;
}
-// -----------------------------------------------------------------------------
-
void SfxCommonPrintOptionsTabPage::ImplUpdateControls( const PrinterOptions* pCurrentOptions )
{
aReduceTransparencyCB.Check( pCurrentOptions->IsReduceTransparency() );
@@ -279,8 +254,6 @@ void SfxCommonPrintOptionsTabPage::ImplUpdateControls( const PrinterOptions* pCu
ClickReduceBitmapsCBHdl( &aReduceBitmapsCB );
}
-// -----------------------------------------------------------------------------
-
void SfxCommonPrintOptionsTabPage::ImplSetAccessibleNames()
{
static const String cSeparator = String::CreateFromAscii( " - " );
@@ -379,8 +352,6 @@ void SfxCommonPrintOptionsTabPage::ImplSetAccessibleNames()
aTransparencyCB.SetAccessibleName( sAccessibleName );
}
-// -----------------------------------------------------------------------------
-
void SfxCommonPrintOptionsTabPage::ImplSaveControls( PrinterOptions* pCurrentOptions )
{
pCurrentOptions->SetReduceTransparency( aReduceTransparencyCB.IsChecked() );
@@ -397,8 +368,6 @@ void SfxCommonPrintOptionsTabPage::ImplSaveControls( PrinterOptions* pCurrentOpt
pCurrentOptions->SetConvertToGreyscales( aConvertToGreyscalesCB.IsChecked() );
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceTransparencyCBHdl, CheckBox*, pBox )
{
(void)pBox; //unused
@@ -412,8 +381,6 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceTransparencyCBHdl, CheckBox*
return 0;
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceGradientsCBHdl, CheckBox*, pBox )
{
(void)pBox; //unused
@@ -428,8 +395,6 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceGradientsCBHdl, CheckBox*, p
return 0;
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceBitmapsCBHdl, CheckBox*, pBox )
{
(void)pBox; //unused
@@ -446,8 +411,6 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceBitmapsCBHdl, CheckBox*, pBo
return 0;
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleReduceGradientsStripesRBHdl, RadioButton*, pButton )
{
(void)pButton; //unused
@@ -458,8 +421,6 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleReduceGradientsStripesRBHdl, Radi
return 0;
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleReduceBitmapsResolutionRBHdl, RadioButton*, pButton )
{
(void)pButton; //unused
@@ -470,8 +431,6 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleReduceBitmapsResolutionRBHdl, Rad
return 0;
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrinterRBHdl, RadioButton*, pButton )
{
if( pButton->IsChecked() )
@@ -479,9 +438,8 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrinterRBHdl, RadioButton*,
aOutputGB.SetText( OutputDevice::GetNonMnemonicString( pButton->GetText() ) );
ImplUpdateControls( &maPrinterOptions );
bOutputForPrinter = TRUE;
- // --> OD 2008-06-25 #i63982#
+ // #i63982#
ImplSetAccessibleNames();
- // <--
}
else
ImplSaveControls( &maPrinterOptions );
@@ -489,8 +447,6 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrinterRBHdl, RadioButton*,
return 0;
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrintFileRBHdl, RadioButton*, pButton )
{
if( pButton->IsChecked() )
@@ -498,9 +454,8 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrintFileRBHdl, RadioButton
aOutputGB.SetText( OutputDevice::GetNonMnemonicString( pButton->GetText() ) );
ImplUpdateControls( &maPrintFileOptions );
bOutputForPrinter = FALSE;
- // --> OD 2008-06-25 #i63982#
+ // #i63982#
ImplSetAccessibleNames();
- // <--
}
else
ImplSaveControls( &maPrintFileOptions );
@@ -508,10 +463,6 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrintFileRBHdl, RadioButton
return 0;
}
-// -------------------------------
-// - TransparencyPrintWarningBox -
-// -------------------------------
-
TransparencyPrintWarningBox::TransparencyPrintWarningBox( Window* pParent ) :
ModalDialog( pParent, SfxResId( RID_WARN_PRINTTRANSPARENCY ) ),
aWarnFI ( this, SfxResId( FI_PRINTTRANSWARN ) ),
@@ -529,14 +480,10 @@ TransparencyPrintWarningBox::TransparencyPrintWarningBox( Window* pParent ) :
aNoBtn.SetClickHdl( LINK( this, TransparencyPrintWarningBox, ClickNoBtn ) );
}
-// -----------------------------------------------------------------------------
-
TransparencyPrintWarningBox::~TransparencyPrintWarningBox()
{
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK( TransparencyPrintWarningBox, ClickNoBtn, PushButton*, pButton )
{
(void)pButton; //unused