diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-02-26 18:29:17 +1100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 05:48:00 -0600 |
commit | 81afed113d2f49c600eb2c8d3827ff8cbd83139f (patch) | |
tree | 822c6131a00a0facbe417ecba52fd075bb32e2a1 /vcl/source/app | |
parent | 3edcdd43f94e605c08314ab61f64c418b01f8dde (diff) |
Removed unnecessary comment decorations from VCL sources
Conflicts:
vcl/headless/svpgdi.cxx
vcl/source/app/dbggui.cxx
vcl/source/app/help.cxx
vcl/source/app/idlemgr.cxx
vcl/source/app/settings.cxx
vcl/source/app/stdtext.cxx
vcl/source/app/svdata.cxx
vcl/source/app/svmain.cxx
vcl/source/control/fixed.cxx
vcl/source/control/ilstbox.cxx
vcl/source/control/spinbtn.cxx
vcl/source/filter/sgfbram.cxx
vcl/source/filter/sgvmain.cxx
vcl/source/filter/sgvtext.cxx
vcl/source/filter/wmf/emfwr.hxx
vcl/source/filter/wmf/winmtf.hxx
vcl/source/filter/wmf/wmfwr.hxx
vcl/source/fontsubset/cff.cxx
vcl/source/fontsubset/fontsubset.cxx
vcl/source/fontsubset/xlat.cxx
Change-Id: Ifc4fa21e552a8b031645eb883bdc23563eebb602
Reviewed-on: https://gerrit.libreoffice.org/8357
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source/app')
-rw-r--r-- | vcl/source/app/dbggui.cxx | 62 | ||||
-rw-r--r-- | vcl/source/app/help.cxx | 81 | ||||
-rw-r--r-- | vcl/source/app/idlemgr.cxx | 12 | ||||
-rw-r--r-- | vcl/source/app/settings.cxx | 74 | ||||
-rw-r--r-- | vcl/source/app/stdtext.cxx | 4 | ||||
-rw-r--r-- | vcl/source/app/svdata.cxx | 12 | ||||
-rw-r--r-- | vcl/source/app/svmain.cxx | 3 |
7 files changed, 0 insertions, 248 deletions
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index de610b39a09a..0cfe966a83f1 100644 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -61,8 +61,6 @@ using namespace ::com::sun::star; - - static const sal_Char* pDbgHelpText[] = { "Object Test\n", @@ -275,11 +273,8 @@ static const sal_Char* pDbgHelpText[] = NULL }; - - namespace { - typedef ::std::map< OUString, DbgChannelId > UserDefinedChannels; UserDefinedChannels& ImplDbgGetUserDefinedChannels() { @@ -287,7 +282,6 @@ namespace return s_aChannels; } - void ImplAppendUserDefinedChannels( ListBox& rList ) { const UserDefinedChannels& rChannels = ImplDbgGetUserDefinedChannels(); @@ -301,7 +295,6 @@ namespace } } - void ImplSelectChannel( ListBox& rList, sal_uLong nChannelToSelect, sal_uInt16 nPositionOffset ) { if ( nChannelToSelect < DBG_OUT_USER_CHANNEL_0 ) @@ -330,12 +323,6 @@ namespace } } - - - -// - DbgWindow - - - #define DBGWIN_MAXLINES 100 class DbgWindow : public WorkWindow @@ -356,10 +343,6 @@ private: void GetAssertionEntryRange( sal_uInt16 nInbetweenEntry, sal_uInt16& nFirst, sal_uInt16& nLast ); }; - -// - DbgInfoDialog - - - class DbgInfoDialog : public ModalDialog { private: @@ -373,10 +356,6 @@ public: void SetInfoText( const OUString& rStr ); }; - -// - DbgDialog - - - class DbgDialog : public ModalDialog { private: @@ -425,13 +404,9 @@ public: void RequestHelp( const HelpEvent& rHEvt ); }; - - static sal_Char aDbgInfoBuf[12288]; static sal_Char aDbgOutBuf[DBG_BUF_MAXLEN]; - - DbgWindow::DbgWindow() : WorkWindow( NULL, WB_STDWORK ), maLstBox( this, WB_AUTOHSCROLL ) @@ -453,8 +428,6 @@ DbgWindow::DbgWindow() : Update(); } - - bool DbgWindow::Close() { // remember window position @@ -472,15 +445,11 @@ bool DbgWindow::Close() return true; } - - void DbgWindow::Resize() { maLstBox.SetSizePixel( GetOutputSizePixel() ); } - - void DbgWindow::GetAssertionEntryRange( sal_uInt16 nInbetweenEntry, sal_uInt16& nFirst, sal_uInt16& nLast ) { nFirst = nInbetweenEntry; @@ -500,8 +469,6 @@ void DbgWindow::GetAssertionEntryRange( sal_uInt16 nInbetweenEntry, sal_uInt16& } } - - bool DbgWindow::PreNotify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_COMMAND ) @@ -551,8 +518,6 @@ bool DbgWindow::PreNotify( NotifyEvent& rNEvt ) return WorkWindow::PreNotify( rNEvt ); } - - void DbgWindow::InsertLine( const OUString& rLine ) { OUString aStr = convertLineEnd(rLine, LINEEND_LF); @@ -580,8 +545,6 @@ void DbgWindow::InsertLine( const OUString& rLine ) maLstBox.Update(); } - - DbgDialog::DbgDialog() : ModalDialog( NULL, WB_STDMODAL | WB_SYSTEMWINDOW ), maXtorThis( this ), @@ -916,8 +879,6 @@ DbgDialog::DbgDialog() : } } - - IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton ) { if ( pButton == &maOKButton ) @@ -1026,8 +987,6 @@ IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton ) return 0; } - - void DbgDialog::RequestHelp( const HelpEvent& rHEvt ) { if ( rHEvt.GetMode() & HELPMODE_CONTEXT ) @@ -1046,8 +1005,6 @@ void DbgDialog::RequestHelp( const HelpEvent& rHEvt ) } } - - DbgInfoDialog::DbgInfoDialog( Window* pParent, bool bHelpText ) : ModalDialog( pParent, WB_STDMODAL ), maListBox( this, WB_BORDER | WB_AUTOHSCROLL ), @@ -1071,8 +1028,6 @@ DbgInfoDialog::DbgInfoDialog( Window* pParent, bool bHelpText ) : SetOutputSizePixel( Size( 640, 420 ) ); } - - void DbgInfoDialog::SetInfoText( const OUString& rStr ) { maListBox.SetUpdateMode( false ); @@ -1121,8 +1076,6 @@ void DbgInfoDialog::SetInfoText( const OUString& rStr ) maListBox.SetUpdateMode( true ); } - - void DbgDialogTest( Window* pWindow ) { bool aAccelBuf[65536] = {false}; @@ -1481,7 +1434,6 @@ void DbgDialogTest( Window* pWindow ) delete [] pRectAry; } - #ifndef WNT #define USE_VCL_MSGBOX #define COPY_BUTTON_ID 25 @@ -1612,8 +1564,6 @@ void DbgPrintMsgBox( const char* pLine ) DbgCoreDump(); } - - class SolarWindowPrinter : public ::vcl::SolarThreadExecutor { private: @@ -1642,8 +1592,6 @@ long SolarWindowPrinter::doIt() return 0L; } - - void DbgPrintWindow( const char* pLine ) { static bool bIn = false; @@ -1663,23 +1611,17 @@ void DbgPrintWindow( const char* pLine ) bIn = false; } - - void DbgAbort( char const * i_message ) { OUString const message( i_message, strlen( i_message ), osl_getThreadTextEncoding() ); Application::Abort( message ); } - - void ImplDbgTestSolarMutex() { assert(ImplGetSVData()->mpDefInst->CheckYieldMutex()); } - - void DbgGUIInit() { DbgSetPrintMsgBox( DbgPrintMsgBox ); @@ -1688,8 +1630,6 @@ void DbgGUIInit() DbgSetAbort( DbgAbort ); } - - void DbgGUIDeInit() { DbgSetPrintMsgBox( NULL ); @@ -1701,8 +1641,6 @@ void DbgGUIDeInit() delete pDbgWindow; } - - void DbgGUIStart() { DbgData* pData = DbgGetData(); diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index c5ea894576b1..b84364e00b24 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -33,8 +33,6 @@ #include "helpwin.hxx" #include "svdata.hxx" - - #define HELPWINSTYLE_QUICK 0 #define HELPWINSTYLE_BALLOON 1 @@ -47,8 +45,6 @@ #define HELPTEXTMAXLEN 150 - - Help::Help() { } @@ -57,10 +53,6 @@ Help::~Help() { } - - - - bool Help::Start( const OUString&, const Window* ) { return false; @@ -71,57 +63,41 @@ bool Help::SearchKeyword( const OUString& ) return false; } - - OUString Help::GetHelpText( const OUString&, const Window* ) { return OUString(); } - - void Help::EnableContextHelp() { ImplGetSVData()->maHelpData.mbContextHelp = true; } - - void Help::DisableContextHelp() { ImplGetSVData()->maHelpData.mbContextHelp = false; } - - bool Help::IsContextHelpEnabled() { return ImplGetSVData()->maHelpData.mbContextHelp; } - - void Help::EnableExtHelp() { ImplGetSVData()->maHelpData.mbExtHelp = true; } - - void Help::DisableExtHelp() { ImplGetSVData()->maHelpData.mbExtHelp = false; } - - bool Help::IsExtHelpEnabled() { return ImplGetSVData()->maHelpData.mbExtHelp; } - - bool Help::StartExtHelp() { ImplSVData* pSVData = ImplGetSVData(); @@ -139,8 +115,6 @@ bool Help::StartExtHelp() return false; } - - bool Help::EndExtHelp() { ImplSVData* pSVData = ImplGetSVData(); @@ -157,29 +131,21 @@ bool Help::EndExtHelp() return false; } - - void Help::EnableBalloonHelp() { ImplGetSVData()->maHelpData.mbBalloonHelp = true; } - - void Help::DisableBalloonHelp() { ImplGetSVData()->maHelpData.mbBalloonHelp = false; } - - bool Help::IsBalloonHelpEnabled() { return ImplGetSVData()->maHelpData.mbBalloonHelp; } - - bool Help::ShowBalloon( Window* pParent, const Point& rScreenPos, const OUString& rHelpText ) @@ -190,8 +156,6 @@ bool Help::ShowBalloon( Window* pParent, return true; } - - bool Help::ShowBalloon( Window* pParent, const Point& rScreenPos, const Rectangle& rRect, const OUString& rHelpText ) @@ -202,29 +166,21 @@ bool Help::ShowBalloon( Window* pParent, return true; } - - void Help::EnableQuickHelp() { ImplGetSVData()->maHelpData.mbQuickHelp = true; } - - void Help::DisableQuickHelp() { ImplGetSVData()->maHelpData.mbQuickHelp = false; } - - bool Help::IsQuickHelpEnabled() { return ImplGetSVData()->maHelpData.mbQuickHelp; } - - bool Help::ShowQuickHelp( Window* pParent, const Rectangle& rScreenRect, const OUString& rHelpText, @@ -237,8 +193,6 @@ bool Help::ShowQuickHelp( Window* pParent, return true; } - - void Help::HideBalloonAndQuickHelp() { HelpTextWindow const * pHelpWin = ImplGetSVData()->maHelpData.mpHelpWin; @@ -246,8 +200,6 @@ void Help::HideBalloonAndQuickHelp() ImplDestroyHelpWindow( bIsVisible ); } - - sal_uIntPtr Help::ShowTip( Window* pParent, const Rectangle& rScreenRect, const OUString& rText, sal_uInt16 nStyle ) { @@ -261,8 +213,6 @@ sal_uIntPtr Help::ShowTip( Window* pParent, const Rectangle& rScreenRect, return nId; } - - void Help::UpdateTip( sal_uIntPtr nId, Window* pParent, const Rectangle& rScreenRect, const OUString& rText ) { HelpTextWindow* pHelpWin = reinterpret_cast< HelpTextWindow* >( nId ); @@ -277,8 +227,6 @@ void Help::UpdateTip( sal_uIntPtr nId, Window* pParent, const Rectangle& rScreen pHelpWin->Invalidate(); } - - void Help::HideTip( sal_uLong nId ) { HelpTextWindow* pHelpWin = (HelpTextWindow*)nId; @@ -290,8 +238,6 @@ void Help::HideTip( sal_uLong nId ) ImplGetSVData()->maHelpData.mnLastHelpHideTime = Time::GetSystemTicks(); } - - HelpTextWindow::HelpTextWindow( Window* pParent, const OUString& rText, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle ) : FloatingWindow( pParent, WB_SYSTEMWINDOW|WB_TOOLTIPWIN ), // #105827# if we change the parent, mirroring will not work correctly when positioning this window maHelpText( rText ) @@ -342,8 +288,6 @@ HelpTextWindow::HelpTextWindow( Window* pParent, const OUString& rText, sal_uInt maHideTimer.SetTimeout( rHelpSettings.GetTipTimeout() ); } - - HelpTextWindow::~HelpTextWindow() { maShowTimer.Stop(); @@ -353,8 +297,6 @@ HelpTextWindow::~HelpTextWindow() ImplGetSVData()->maHelpData.mpHelpWin = NULL; } - - void HelpTextWindow::SetHelpText( const OUString& rHelpText ) { maHelpText = rHelpText; @@ -396,8 +338,6 @@ void HelpTextWindow::SetHelpText( const OUString& rHelpText ) SetOutputSizePixel( aSize ); } - - void HelpTextWindow::ImplShow() { ImplDelData aDogTag( this ); @@ -406,8 +346,6 @@ void HelpTextWindow::ImplShow() Update(); } - - void HelpTextWindow::Paint( const Rectangle& ) { // paint native background @@ -455,8 +393,6 @@ void HelpTextWindow::Paint( const Rectangle& ) } } - - void HelpTextWindow::ShowHelp( sal_uInt16 nDelayMode ) { sal_uLong nTimeout = 0; @@ -482,8 +418,6 @@ void HelpTextWindow::ShowHelp( sal_uInt16 nDelayMode ) maShowTimer.Start(); } - - IMPL_LINK( HelpTextWindow, TimerHdl, Timer*, pTimer) { if ( pTimer == &maShowTimer ) @@ -506,8 +440,6 @@ IMPL_LINK( HelpTextWindow, TimerHdl, Timer*, pTimer) return 1; } - - Size HelpTextWindow::CalcOutSize() const { Size aSz = maTextRect.GetSize(); @@ -516,31 +448,22 @@ Size HelpTextWindow::CalcOutSize() const return aSz; } - - void HelpTextWindow::RequestHelp( const HelpEvent& /*rHEvt*/ ) { // Just to assure that Window::RequestHelp() is not called by // ShowQuickHelp/ShowBalloonHelp in the HelpTextWindow. } - - OUString HelpTextWindow::GetText() const { return maHelpText; } - - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > HelpTextWindow::CreateAccessible() { return FloatingWindow::CreateAccessible(); } - - - void ImplShowHelpWindow( Window* pParent, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle, const OUString& rHelpText, const OUString& rStatusText, const Point& rScreenPos, const Rectangle* pHelpArea ) @@ -618,8 +541,6 @@ void ImplShowHelpWindow( Window* pParent, sal_uInt16 nHelpWinStyle, sal_uInt16 n } } - - void ImplDestroyHelpWindow( bool bUpdateHideTime ) { ImplSVData* pSVData = ImplGetSVData(); @@ -640,8 +561,6 @@ void ImplDestroyHelpWindow( bool bUpdateHideTime ) } } - - void ImplSetHelpWindowPos( Window* pHelpWin, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle, const Point& rPos, const Rectangle* pHelpArea ) { diff --git a/vcl/source/app/idlemgr.cxx b/vcl/source/app/idlemgr.cxx index d4930dea6331..cd41d1260caa 100644 --- a/vcl/source/app/idlemgr.cxx +++ b/vcl/source/app/idlemgr.cxx @@ -21,8 +21,6 @@ #include <idlemgr.hxx> - - struct ImplIdleData { Link maIdleHdl; @@ -32,8 +30,6 @@ struct ImplIdleData #define IMPL_IDLETIMEOUT 350 - - ImplIdleMgr::ImplIdleMgr() { mpIdleList = new ImplIdleList(); @@ -42,8 +38,6 @@ ImplIdleMgr::ImplIdleMgr() maTimer.SetTimeoutHdl( LINK( this, ImplIdleMgr, TimeoutHdl ) ); } - - ImplIdleMgr::~ImplIdleMgr() { // Liste loeschen @@ -54,8 +48,6 @@ ImplIdleMgr::~ImplIdleMgr() delete mpIdleList; } - - bool ImplIdleMgr::InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority ) { size_t nPos = (size_t)-1; @@ -90,8 +82,6 @@ bool ImplIdleMgr::InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority ) return true; } - - void ImplIdleMgr::RemoveIdleHdl( const Link& rLink ) { for ( ImplIdleList::iterator it = mpIdleList->begin(); it != mpIdleList->end(); ++it ) { @@ -107,8 +97,6 @@ void ImplIdleMgr::RemoveIdleHdl( const Link& rLink ) maTimer.Stop(); } - - IMPL_LINK_NOARG(ImplIdleMgr, TimeoutHdl) { for ( size_t i = 0; i < mpIdleList->size(); ++i ) { diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 0356c88c9154..2eeef09ced5e 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -284,8 +284,6 @@ ImplMouseData::ImplMouseData() mnWheelBehavior = MOUSE_WHEEL_ALWAYS; } - - ImplMouseData::ImplMouseData( const ImplMouseData& rData ) { mnOptions = rData.mnOptions; @@ -324,7 +322,6 @@ MouseSettings::GetOptions() const return mpData->mnOptions; } - void MouseSettings::SetDoubleClickTime( sal_uLong nDoubleClkTime ) { @@ -604,8 +601,6 @@ MouseSettings::~MouseSettings() { } - - void MouseSettings::CopyData() { // copy if other references exist @@ -614,8 +609,6 @@ void MouseSettings::CopyData() } } - - bool MouseSettings::operator ==( const MouseSettings& rSet ) const { if ( mpData == rSet.mpData ) @@ -647,8 +640,6 @@ bool MouseSettings::operator ==( const MouseSettings& rSet ) const return false; } - - ImplStyleData::ImplStyleData() : mIconThemeScanner(vcl::IconThemeScanner::Create(vcl::IconThemeScanner::GetStandardIconThemePath())), mIconThemeSelector(new vcl::IconThemeSelector()), @@ -691,8 +682,6 @@ ImplStyleData::ImplStyleData() : SetStandardStyles(); } - - ImplStyleData::ImplStyleData( const ImplStyleData& rData ) : maActiveBorderColor( rData.maActiveBorderColor ), maActiveColor( rData.maActiveColor ), @@ -2343,8 +2332,6 @@ const Size& StyleSettings::GetListBoxPreviewDefaultPixelSize() const return mpData->maListBoxPreviewDefaultPixelSize; } - - void StyleSettings::Set3DColors( const Color& rColor ) { CopyData(); @@ -2404,8 +2391,6 @@ bool StyleSettings::GetUseImagesInMenus() const } } - - static BitmapEx readBitmapEx( const OUString& rPath ) { OUString aPath( rPath ); @@ -2496,16 +2481,12 @@ const BitmapEx StyleSettings::GetPersonaHeader() const return mpData->maPersonaHeaderBitmap; } - - void StyleSettings::SetStandardStyles() { CopyData(); mpData->SetStandardStyles(); } - - Color StyleSettings::GetFaceGradientColor() const { // compute a brighter face color that can be used in gradients @@ -2518,8 +2499,6 @@ Color StyleSettings::GetFaceGradientColor() const return Color( Color::HSBtoRGB( h, s, b ) ); } - - Color StyleSettings::GetSeparatorColor() const { // compute a brighter shadow color for separators (used in toolbars or between menubar and toolbars on Windows XP) @@ -2538,8 +2517,6 @@ void StyleSettings::CopyData() } } - - bool StyleSettings::operator ==( const StyleSettings& rSet ) const { if ( mpData == rSet.mpData ) @@ -2661,8 +2638,6 @@ bool StyleSettings::operator ==( const StyleSettings& rSet ) const return false; } - - ImplMiscData::ImplMiscData() { mnEnableATT = TRISTATE_INDET; @@ -2671,8 +2646,6 @@ ImplMiscData::ImplMiscData() mbEnableLocalizedDecimalSep = (pEnv != NULL) ? true : false; } - - ImplMiscData::ImplMiscData( const ImplMiscData& rData ) { mnEnableATT = rData.mnEnableATT; @@ -2680,8 +2653,6 @@ ImplMiscData::ImplMiscData( const ImplMiscData& rData ) mbEnableLocalizedDecimalSep = rData.mbEnableLocalizedDecimalSep; } - - MiscSettings::MiscSettings() : mpData(boost::make_shared<ImplMiscData>()) { @@ -2699,8 +2670,6 @@ void MiscSettings::CopyData() } } - - bool MiscSettings::operator ==( const MiscSettings& rSet ) const { if ( mpData == rSet.mpData ) @@ -2734,7 +2703,6 @@ bool MiscSettings::GetDisablePrinting() const return mpData->mnDisablePrinting != TRISTATE_FALSE; } - bool MiscSettings::GetEnableATToolSupport() const { @@ -2870,8 +2838,6 @@ bool MiscSettings::GetEnableLocalizedDecimalSep() const return mpData->mbEnableLocalizedDecimalSep; } - - ImplHelpData::ImplHelpData() { mnOptions = 0; @@ -2880,8 +2846,6 @@ ImplHelpData::ImplHelpData() mnBalloonDelay = 1500; } - - ImplHelpData::ImplHelpData( const ImplHelpData& rData ) { mnOptions = rData.mnOptions; @@ -2890,8 +2854,6 @@ ImplHelpData::ImplHelpData( const ImplHelpData& rData ) mnBalloonDelay = rData.mnBalloonDelay; } - - HelpSettings::HelpSettings() : mpData(boost::make_shared<ImplHelpData>()) { @@ -2909,8 +2871,6 @@ void HelpSettings::CopyData() } } - - bool HelpSettings::operator ==( const HelpSettings& rSet ) const { if ( mpData == rSet.mpData ) @@ -2997,8 +2957,6 @@ ImplAllSettingsData::ImplAllSettingsData() maMiscSettings.SetEnableLocalizedDecimalSep( maSysLocale.GetOptions().IsDecimalSeparatorAsLocale() ); } - - ImplAllSettingsData::ImplAllSettingsData( const ImplAllSettingsData& rData ) : maMouseSettings( rData.maMouseSettings ), maStyleSettings( rData.maStyleSettings ), @@ -3018,8 +2976,6 @@ ImplAllSettingsData::ImplAllSettingsData( const ImplAllSettingsData& rData ) : mpUII18nHelper = NULL; } - - ImplAllSettingsData::~ImplAllSettingsData() { delete mpLocaleDataWrapper; @@ -3030,22 +2986,16 @@ ImplAllSettingsData::~ImplAllSettingsData() delete mpUII18nHelper; } - - AllSettings::AllSettings() : mpData(boost::make_shared<ImplAllSettingsData>()) { } - - AllSettings::AllSettings( const AllSettings& rSet ) { mpData = rSet.mpData; } - - AllSettings::~AllSettings() { } @@ -3059,8 +3009,6 @@ void AllSettings::CopyData() } - - sal_uLong AllSettings::Update( sal_uLong nFlags, const AllSettings& rSet ) { @@ -3123,8 +3071,6 @@ sal_uLong AllSettings::Update( sal_uLong nFlags, const AllSettings& rSet ) return nChangeFlags; } - - sal_uLong AllSettings::GetChangeFlags( const AllSettings& rSet ) const { @@ -3148,8 +3094,6 @@ sal_uLong AllSettings::GetChangeFlags( const AllSettings& rSet ) const return nChangeFlags; } - - bool AllSettings::operator ==( const AllSettings& rSet ) const { @@ -3170,8 +3114,6 @@ bool AllSettings::operator ==( const AllSettings& rSet ) const return false; } - - void AllSettings::SetLanguageTag( const LanguageTag& rLanguageTag ) { if (mpData->maLocale != rLanguageTag) @@ -3193,15 +3135,11 @@ void AllSettings::SetLanguageTag( const LanguageTag& rLanguageTag ) } } - - void AllSettings::SetUILanguageTag( const LanguageTag& ) { // there is only one UILocale per process } - - namespace { bool GetConfigLayoutRTL(bool bMath) @@ -3261,8 +3199,6 @@ bool AllSettings::GetMathLayoutRTL() const return GetConfigLayoutRTL(true); } - - const LanguageTag& AllSettings::GetLanguageTag() const { // SYSTEM locale means: use settings from SvtSysLocale that is resolved @@ -3272,8 +3208,6 @@ const LanguageTag& AllSettings::GetLanguageTag() const return mpData->maLocale; } - - const LanguageTag& AllSettings::GetUILanguageTag() const { // the UILocale is never changed @@ -3283,8 +3217,6 @@ const LanguageTag& AllSettings::GetUILanguageTag() const return mpData->maUILocale; } - - const LocaleDataWrapper& AllSettings::GetLocaleDataWrapper() const { if ( !mpData->mpLocaleDataWrapper ) @@ -3293,8 +3225,6 @@ const LocaleDataWrapper& AllSettings::GetLocaleDataWrapper() const return *mpData->mpLocaleDataWrapper; } - - const LocaleDataWrapper& AllSettings::GetUILocaleDataWrapper() const { if ( !mpData->mpUILocaleDataWrapper ) @@ -3303,8 +3233,6 @@ const LocaleDataWrapper& AllSettings::GetUILocaleDataWrapper() const return *mpData->mpUILocaleDataWrapper; } - - const vcl::I18nHelper& AllSettings::GetLocaleI18nHelper() const { if ( !mpData->mpI18nHelper ) { @@ -3314,8 +3242,6 @@ const vcl::I18nHelper& AllSettings::GetLocaleI18nHelper() const return *mpData->mpI18nHelper; } - - const vcl::I18nHelper& AllSettings::GetUILocaleI18nHelper() const { if ( !mpData->mpUII18nHelper ) { diff --git a/vcl/source/app/stdtext.cxx b/vcl/source/app/stdtext.cxx index 2561e88d5e31..4758a2533189 100644 --- a/vcl/source/app/stdtext.cxx +++ b/vcl/source/app/stdtext.cxx @@ -25,8 +25,6 @@ #include <svdata.hxx> - - OUString GetStandardText( sal_uInt16 nStdText ) { ResMgr* pResMgr = ImplGetResMgr(); @@ -38,8 +36,6 @@ OUString GetStandardText( sal_uInt16 nStdText ) return OUString(); } - - void ShowServiceNotAvailableError(Window* pParent, const OUString& rServiceName, bool bError) { diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index 0a0df59cb8aa..5fce326532b4 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -55,8 +55,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::awt; - - namespace { struct private_aImplSVData : @@ -74,8 +72,6 @@ SalSystem* ImplGetSalSystem() return pSVData->mpSalSystem; } - - void ImplInitSVData() { pImplSVData = &private_aImplSVData::get(); @@ -89,8 +85,6 @@ void ImplInitSVData() pImplSVData->maAppData.mnDefaultLayoutBorder = -1; } - - void ImplDeInitSVData() { ImplSVData* pSVData = ImplGetSVData(); @@ -110,15 +104,11 @@ void ImplDeInitSVData() delete pSVData->mpPaperNames, pSVData->mpPaperNames = NULL; } - - void ImplDestroySVData() { pImplSVData = NULL; } - - Window* ImplGetDefaultWindow() { ImplSVData* pSVData = ImplGetSVData(); @@ -149,8 +139,6 @@ Window* ImplGetDefaultWindow() return pSVData->mpDefaultWin; } - - ResMgr* ImplGetResMgr() { ImplSVData* pSVData = ImplGetSVData(); diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 511a95ef1d70..6d6cecfc9da1 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -81,8 +81,6 @@ using namespace ::com::sun::star; - - oslSignalAction SAL_CALL VCLExceptionSignal_impl( void* /*pData*/, oslSignalInfo* pInfo) { static bool bIn = false; @@ -139,7 +137,6 @@ oslSignalAction SAL_CALL VCLExceptionSignal_impl( void* /*pData*/, oslSignalInfo } - int ImplSVMain() { // The 'real' SVMain() |