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 | |
| 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')
36 files changed, 15 insertions, 1220 deletions
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index e8f4d843a92c..9a3fa5e2d2aa 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -60,7 +60,6 @@ rDevice #endif } - #ifndef IOS bool SvpSalGraphics::drawAlphaBitmap( const SalTwoRect&, const SalBitmap& /*rSourceBitmap*/, const SalBitmap& /*rAlphaBitmap*/ ) diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx index cdf0e182c66a..9aa08e91ab46 100644 --- a/vcl/headless/svpinst.cxx +++ b/vcl/headless/svpinst.cxx @@ -380,10 +380,6 @@ void* SvpSalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rReturn return const_cast<char*>(""); } - -// - SalTimer - - - void SvpSalInstance::StopTimer() { m_aTimeout.tv_sec = 0; diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx index e09433900158..d0ee938de0c0 100644 --- a/vcl/headless/svpprn.cxx +++ b/vcl/headless/svpprn.cxx @@ -156,9 +156,7 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData ) } } -/* - * SalInstance - */ +// SalInstance SalInfoPrinter* SvpSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo, ImplJobSetup* pJobSetup ) 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() diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index db1806eaeeb4..a336879f5d7e 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -32,8 +32,6 @@ #include "impimagetree.hxx" #include "window.h" - - #define FIXEDLINE_TEXT_BORDER 4 #define FIXEDTEXT_VIEW_STYLE (WB_3DLOOK | \ @@ -51,8 +49,6 @@ WB_TOP | WB_VCENTER | WB_BOTTOM | \ WB_SCALE) - - static Point ImplCalcPos( WinBits nStyle, const Point& rPos, const Size& rObjSize, const Size& rWinSize ) { @@ -85,8 +81,6 @@ static Point ImplCalcPos( WinBits nStyle, const Point& rPos, return aPos; } - - void FixedText::ImplInit( Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle( nStyle ); @@ -94,8 +88,6 @@ void FixedText::ImplInit( Window* pParent, WinBits nStyle ) ImplInitSettings( true, true, true ); } - - WinBits FixedText::ImplInitStyle( WinBits nStyle ) { if ( !(nStyle & WB_NOGROUP) ) @@ -103,21 +95,16 @@ WinBits FixedText::ImplInitStyle( WinBits nStyle ) return nStyle; } - - const Font& FixedText::GetCanonicalFont( const StyleSettings& _rStyle ) const { return ( GetStyle() & WB_INFO ) ? _rStyle.GetInfoFont() : _rStyle.GetLabelFont(); } - const Color& FixedText::GetCanonicalTextColor( const StyleSettings& _rStyle ) const { return ( GetStyle() & WB_INFO ) ? _rStyle.GetInfoTextColor() : _rStyle.GetLabelTextColor(); } - - void FixedText::ImplInitSettings( bool bFont, bool bForeground, bool bBackground ) { @@ -147,8 +134,6 @@ void FixedText::ImplInitSettings( bool bFont, } } - - FixedText::FixedText( Window* pParent, WinBits nStyle ) : Control(WINDOW_FIXEDTEXT) , m_nMaxWidthChars(-1) @@ -158,8 +143,6 @@ FixedText::FixedText( Window* pParent, WinBits nStyle ) ImplInit( pParent, nStyle ); } - - FixedText::FixedText( Window* pParent, const ResId& rResId ) : Control(WINDOW_FIXEDTEXT) , m_nMaxWidthChars(-1) @@ -175,8 +158,6 @@ FixedText::FixedText( Window* pParent, const ResId& rResId ) Show(); } - - sal_uInt16 FixedText::ImplGetTextStyle( WinBits nWinStyle ) { sal_uInt16 nTextStyle = TEXT_DRAW_MNEMONIC | TEXT_DRAW_ENDELLIPSIS; @@ -208,8 +189,6 @@ sal_uInt16 FixedText::ImplGetTextStyle( WinBits nWinStyle ) return nTextStyle; } - - void FixedText::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize, bool bFillLayout @@ -256,15 +235,11 @@ void FixedText::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, ); } - - void FixedText::Paint( const Rectangle& ) { ImplDraw( this, 0, Point(), GetOutputSizePixel() ); } - - void FixedText::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { @@ -303,16 +278,12 @@ void FixedText::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, pDev->Pop(); } - - void FixedText::Resize() { Control::Resize(); Invalidate(); } - - void FixedText::StateChanged( StateChangedType nType ) { Control::StateChanged( nType ); @@ -352,8 +323,6 @@ void FixedText::StateChanged( StateChangedType nType ) } } - - void FixedText::DataChanged( const DataChangedEvent& rDCEvt ) { Control::DataChanged( rDCEvt ); @@ -368,8 +337,6 @@ void FixedText::DataChanged( const DataChangedEvent& rDCEvt ) } } - - Size FixedText::getTextDimensions(Control const *pControl, const OUString &rTxt, long nMaxWidth) { sal_uInt16 nStyle = ImplGetTextStyle( pControl->GetStyle() ); @@ -380,7 +347,6 @@ Size FixedText::getTextDimensions(Control const *pControl, const OUString &rTxt, rTxt, nStyle).GetSize(); } - Size FixedText::CalcMinimumTextSize( Control const *pControl, long nMaxWidth ) { Size aSize = getTextDimensions(pControl, pControl->GetText(), nMaxWidth); @@ -402,7 +368,6 @@ Size FixedText::CalcMinimumSize( long nMaxWidth ) const return CalcWindowSize( CalcMinimumTextSize ( this, nMaxWidth ) ); } - Size FixedText::GetOptimalSize() const { sal_Int32 nMaxAvailWidth = 0x7fffffff; @@ -425,8 +390,6 @@ Size FixedText::GetOptimalSize() const return aRet; } - - void FixedText::FillLayoutData() const { mpControlData->mpLayoutData = new vcl::ControlLayoutData(); @@ -514,8 +477,6 @@ SelectableFixedText::SelectableFixedText(Window* pParent, WinBits nStyle) SetPaintTransparent( true ); } - - void SelectableFixedText::LoseFocus() { Edit::LoseFocus(); @@ -523,8 +484,6 @@ void SelectableFixedText::LoseFocus() Invalidate(); } - - void FixedLine::ImplInit( Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle( nStyle ); @@ -532,8 +491,6 @@ void FixedLine::ImplInit( Window* pParent, WinBits nStyle ) ImplInitSettings( true, true, true ); } - - WinBits FixedLine::ImplInitStyle( WinBits nStyle ) { if ( !(nStyle & WB_NOGROUP) ) @@ -541,21 +498,16 @@ WinBits FixedLine::ImplInitStyle( WinBits nStyle ) return nStyle; } - - const Font& FixedLine::GetCanonicalFont( const StyleSettings& _rStyle ) const { return _rStyle.GetGroupFont(); } - const Color& FixedLine::GetCanonicalTextColor( const StyleSettings& _rStyle ) const { return _rStyle.GetGroupTextColor(); } - - void FixedLine::ImplInitSettings( bool bFont, bool bForeground, bool bBackground ) { @@ -585,8 +537,6 @@ void FixedLine::ImplInitSettings( bool bFont, } } - - void FixedLine::ImplDraw( bool bLayout ) { Size aOutSize = GetOutputSizePixel(); @@ -660,8 +610,6 @@ void FixedLine::ImplDraw( bool bLayout ) } } - - FixedLine::FixedLine( Window* pParent, WinBits nStyle ) : Control( WINDOW_FIXEDLINE ) { @@ -669,8 +617,6 @@ FixedLine::FixedLine( Window* pParent, WinBits nStyle ) : SetSizePixel( Size( 2, 2 ) ); } - - FixedLine::FixedLine( Window* pParent, const ResId& rResId ) : Control( WINDOW_FIXEDLINE ) { @@ -683,38 +629,27 @@ FixedLine::FixedLine( Window* pParent, const ResId& rResId ) : Show(); } - - void FixedLine::FillLayoutData() const { mpControlData->mpLayoutData = new vcl::ControlLayoutData(); const_cast<FixedLine*>(this)->ImplDraw( true ); } - - - void FixedLine::Paint( const Rectangle& ) { ImplDraw(); } - - void FixedLine::Draw( OutputDevice*, const Point&, const Size&, sal_uLong ) { } - - void FixedLine::Resize() { Control::Resize(); Invalidate(); } - - void FixedLine::StateChanged( StateChangedType nType ) { Control::StateChanged( nType ); @@ -752,8 +687,6 @@ void FixedLine::StateChanged( StateChangedType nType ) } } - - void FixedLine::DataChanged( const DataChangedEvent& rDCEvt ) { Control::DataChanged( rDCEvt ); @@ -768,15 +701,11 @@ void FixedLine::DataChanged( const DataChangedEvent& rDCEvt ) } } - - Size FixedLine::GetOptimalSize() const { return CalcWindowSize( FixedText::CalcMinimumTextSize ( this, 0x7fffffff ) ); } - - void FixedBitmap::ImplInit( Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle( nStyle ); @@ -784,8 +713,6 @@ void FixedBitmap::ImplInit( Window* pParent, WinBits nStyle ) ImplInitSettings(); } - - WinBits FixedBitmap::ImplInitStyle( WinBits nStyle ) { if ( !(nStyle & WB_NOGROUP) ) @@ -793,8 +720,6 @@ WinBits FixedBitmap::ImplInitStyle( WinBits nStyle ) return nStyle; } - - void FixedBitmap::ImplInitSettings() { Window* pParent = GetParent(); @@ -818,8 +743,6 @@ void FixedBitmap::ImplInitSettings() } } - - void FixedBitmap::ImplLoadRes( const ResId& rResId ) { Control::ImplLoadRes( rResId ); @@ -833,16 +756,12 @@ void FixedBitmap::ImplLoadRes( const ResId& rResId ) } } - - FixedBitmap::FixedBitmap( Window* pParent, WinBits nStyle ) : Control( WINDOW_FIXEDBITMAP ) { ImplInit( pParent, nStyle ); } - - FixedBitmap::FixedBitmap( Window* pParent, const ResId& rResId ) : Control( WINDOW_FIXEDBITMAP ) { @@ -855,14 +774,10 @@ FixedBitmap::FixedBitmap( Window* pParent, const ResId& rResId ) : Show(); } - - FixedBitmap::~FixedBitmap() { } - - void FixedBitmap::ImplDraw( OutputDevice* pDev, sal_uLong /* nDrawFlags */, const Point& rPos, const Size& rSize ) { @@ -881,15 +796,11 @@ void FixedBitmap::ImplDraw( OutputDevice* pDev, sal_uLong /* nDrawFlags */, } } - - void FixedBitmap::Paint( const Rectangle& ) { ImplDraw( this, 0, Point(), GetOutputSizePixel() ); } - - void FixedBitmap::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { @@ -912,16 +823,12 @@ void FixedBitmap::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize pDev->Pop(); } - - void FixedBitmap::Resize() { Control::Resize(); Invalidate(); } - - void FixedBitmap::StateChanged( StateChangedType nType ) { Control::StateChanged( nType ); @@ -946,8 +853,6 @@ void FixedBitmap::StateChanged( StateChangedType nType ) } } - - void FixedBitmap::DataChanged( const DataChangedEvent& rDCEvt ) { Control::DataChanged( rDCEvt ); @@ -960,8 +865,6 @@ void FixedBitmap::DataChanged( const DataChangedEvent& rDCEvt ) } } - - void FixedBitmap::SetBitmap( const Bitmap& rBitmap ) { maBitmap = rBitmap; @@ -969,8 +872,6 @@ void FixedBitmap::SetBitmap( const Bitmap& rBitmap ) queue_resize(); } - - void FixedImage::ImplInit( Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle( nStyle ); @@ -979,8 +880,6 @@ void FixedImage::ImplInit( Window* pParent, WinBits nStyle ) ImplInitSettings(); } - - WinBits FixedImage::ImplInitStyle( WinBits nStyle ) { if ( !(nStyle & WB_NOGROUP) ) @@ -988,8 +887,6 @@ WinBits FixedImage::ImplInitStyle( WinBits nStyle ) return nStyle; } - - void FixedImage::ImplInitSettings() { Window* pParent = GetParent(); @@ -1013,8 +910,6 @@ void FixedImage::ImplInitSettings() } } - - void FixedImage::ImplLoadRes( const ResId& rResId ) { Control::ImplLoadRes( rResId ); @@ -1028,16 +923,12 @@ void FixedImage::ImplLoadRes( const ResId& rResId ) } } - - FixedImage::FixedImage( Window* pParent, WinBits nStyle ) : Control( WINDOW_FIXEDIMAGE ) { ImplInit( pParent, nStyle ); } - - FixedImage::FixedImage( Window* pParent, const ResId& rResId ) : Control( WINDOW_FIXEDIMAGE ) { @@ -1050,14 +941,10 @@ FixedImage::FixedImage( Window* pParent, const ResId& rResId ) : Show(); } - - FixedImage::~FixedImage() { } - - void FixedImage::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize ) { @@ -1088,28 +975,20 @@ void FixedImage::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, mbInUserDraw = false; } - - void FixedImage::Paint( const Rectangle& ) { ImplDraw( this, 0, Point(), GetOutputSizePixel() ); } - - Size FixedImage::GetOptimalSize() const { return maImage.GetSizePixel(); } - - void FixedImage::UserDraw( const UserDrawEvent& ) { } - - void FixedImage::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { @@ -1131,16 +1010,12 @@ void FixedImage::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, pDev->Pop(); } - - void FixedImage::Resize() { Control::Resize(); Invalidate(); } - - void FixedImage::StateChanged( StateChangedType nType ) { Control::StateChanged( nType ); @@ -1166,8 +1041,6 @@ void FixedImage::StateChanged( StateChangedType nType ) } } - - void FixedImage::DataChanged( const DataChangedEvent& rDCEvt ) { Control::DataChanged( rDCEvt ); @@ -1180,8 +1053,6 @@ void FixedImage::DataChanged( const DataChangedEvent& rDCEvt ) } } - - void FixedImage::SetImage( const Image& rImage ) { if ( rImage != maImage ) @@ -1192,16 +1063,12 @@ void FixedImage::SetImage( const Image& rImage ) } } - - bool FixedImage::SetModeImage( const Image& rImage ) { SetImage( rImage ); return true; } - - const Image& FixedImage::GetModeImage( ) const { return maImage; diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index 107cd75b1856..db96da42b1be 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -45,8 +45,6 @@ using namespace ::com::sun::star; - - void ImplInitFieldSettings( Window* pWin, bool bFont, bool bForeground, bool bBackground ) { const StyleSettings& rStyleSettings = pWin->GetSettings().GetStyleSettings(); @@ -90,8 +88,6 @@ void ImplInitDropDownButton( PushButton* pButton ) pButton->SetBackground(); } - - ImplEntryList::ImplEntryList( Window* pWindow ) { mpWindow = pWindow; @@ -104,23 +100,17 @@ ImplEntryList::ImplEntryList( Window* pWindow ) mnMaxMRUCount = 0; } - - ImplEntryList::~ImplEntryList() { Clear(); } - - void ImplEntryList::Clear() { mnImages = 0; maEntries.clear(); } - - void ImplEntryList::SelectEntry( sal_uInt16 nPos, bool bSelect ) { if (nPos < maEntries.size()) @@ -249,8 +239,6 @@ sal_uInt16 ImplEntryList::InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry return insPos; } - - void ImplEntryList::RemoveEntry( sal_uInt16 nPos ) { if (nPos < maEntries.size()) @@ -264,8 +252,6 @@ void ImplEntryList::RemoveEntry( sal_uInt16 nPos ) } } - - sal_uInt16 ImplEntryList::FindEntry( const OUString& rString, bool bSearchMRUArea ) const { sal_uInt16 nEntries = maEntries.size(); @@ -278,8 +264,6 @@ sal_uInt16 ImplEntryList::FindEntry( const OUString& rString, bool bSearchMRUAre return LISTBOX_ENTRY_NOTFOUND; } - - sal_uInt16 ImplEntryList::FindMatchingEntry( const OUString& rStr, sal_uInt16 nStart, bool bForward, bool bLazy ) const { sal_uInt16 nPos = LISTBOX_ENTRY_NOTFOUND; @@ -316,8 +300,6 @@ sal_uInt16 ImplEntryList::FindMatchingEntry( const OUString& rStr, sal_uInt16 nS return nPos; } - - sal_uInt16 ImplEntryList::FindEntry( const void* pData ) const { sal_uInt16 nPos = LISTBOX_ENTRY_NOTFOUND; @@ -333,8 +315,6 @@ sal_uInt16 ImplEntryList::FindEntry( const void* pData ) const return nPos; } - - long ImplEntryList::GetAddedHeight( sal_uInt16 i_nEndIndex, sal_uInt16 i_nBeginIndex, long i_nBeginHeight ) const { long nHeight = i_nBeginHeight; @@ -361,16 +341,12 @@ long ImplEntryList::GetAddedHeight( sal_uInt16 i_nEndIndex, sal_uInt16 i_nBeginI return i_nEndIndex > i_nBeginIndex ? nHeight : -nHeight; } - - long ImplEntryList::GetEntryHeight( sal_uInt16 nPos ) const { ImplEntryType* pImplEntry = GetEntry( nPos ); return pImplEntry ? pImplEntry->mnHeight : 0; } - - OUString ImplEntryList::GetEntryText( sal_uInt16 nPos ) const { OUString aEntryText; @@ -380,8 +356,6 @@ OUString ImplEntryList::GetEntryText( sal_uInt16 nPos ) const return aEntryText; } - - bool ImplEntryList::HasEntryImage( sal_uInt16 nPos ) const { bool bImage = false; @@ -391,8 +365,6 @@ bool ImplEntryList::HasEntryImage( sal_uInt16 nPos ) const return bImage; } - - Image ImplEntryList::GetEntryImage( sal_uInt16 nPos ) const { Image aImage; @@ -402,8 +374,6 @@ Image ImplEntryList::GetEntryImage( sal_uInt16 nPos ) const return aImage; } - - void ImplEntryList::SetEntryData( sal_uInt16 nPos, void* pNewData ) { ImplEntryType* pImplEntry = GetEntry( nPos ); @@ -411,16 +381,12 @@ void ImplEntryList::SetEntryData( sal_uInt16 nPos, void* pNewData ) pImplEntry->mpUserData = pNewData; } - - void* ImplEntryList::GetEntryData( sal_uInt16 nPos ) const { ImplEntryType* pImplEntry = GetEntry( nPos ); return pImplEntry ? pImplEntry->mpUserData : NULL; } - - void ImplEntryList::SetEntryFlags( sal_uInt16 nPos, long nFlags ) { ImplEntryType* pImplEntry = GetEntry( nPos ); @@ -428,16 +394,12 @@ void ImplEntryList::SetEntryFlags( sal_uInt16 nPos, long nFlags ) pImplEntry->mnFlags = nFlags; } - - long ImplEntryList::GetEntryFlags( sal_uInt16 nPos ) const { ImplEntryType* pImplEntry = GetEntry( nPos ); return pImplEntry ? pImplEntry->mnFlags : 0; } - - sal_uInt16 ImplEntryList::GetSelectEntryCount() const { sal_uInt16 nSelCount = 0; @@ -450,15 +412,11 @@ sal_uInt16 ImplEntryList::GetSelectEntryCount() const return nSelCount; } - - OUString ImplEntryList::GetSelectEntry( sal_uInt16 nIndex ) const { return GetEntryText( GetSelectEntryPos( nIndex ) ); } - - sal_uInt16 ImplEntryList::GetSelectEntryPos( sal_uInt16 nIndex ) const { sal_uInt16 nSelEntryPos = LISTBOX_ENTRY_NOTFOUND; @@ -482,24 +440,18 @@ sal_uInt16 ImplEntryList::GetSelectEntryPos( sal_uInt16 nIndex ) const return nSelEntryPos; } - - bool ImplEntryList::IsEntryPosSelected( sal_uInt16 nIndex ) const { ImplEntryType* pImplEntry = GetEntry( nIndex ); return pImplEntry ? pImplEntry->mbIsSelected : sal_False; } - - bool ImplEntryList::IsEntrySelectable( sal_uInt16 nPos ) const { ImplEntryType* pImplEntry = GetEntry( nPos ); return pImplEntry ? ((pImplEntry->mnFlags & LISTBOX_ENTRY_FLAG_DISABLE_SELECTION) == 0) : true; } - - sal_uInt16 ImplEntryList::FindFirstSelectable( sal_uInt16 nPos, bool bForward /* = true */ ) { if( IsEntrySelectable( nPos ) ) @@ -526,8 +478,6 @@ sal_uInt16 ImplEntryList::FindFirstSelectable( sal_uInt16 nPos, bool bForward /* return LISTBOX_ENTRY_NOTFOUND; } - - ImplListBoxWindow::ImplListBoxWindow( Window* pParent, WinBits nWinStyle ) : Control( pParent, 0 ), maQuickSelectionEngine( *this ) @@ -574,22 +524,16 @@ ImplListBoxWindow::ImplListBoxWindow( Window* pParent, WinBits nWinStyle ) : ImplCalcMetrics(); } - - ImplListBoxWindow::~ImplListBoxWindow() { delete mpEntryList; } - - void ImplListBoxWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackground ) { ImplInitFieldSettings( this, bFont, bForeground, bBackground ); } - - void ImplListBoxWindow::ImplCalcMetrics() { mnMaxWidth = 0; @@ -620,8 +564,6 @@ void ImplListBoxWindow::ImplCalcMetrics() } } - - void ImplListBoxWindow::Clear() { mpEntryList->Clear(); @@ -650,8 +592,6 @@ void ImplListBoxWindow::SetUserItemSize( const Size& rSz ) ImplCalcMetrics(); } - - struct ImplEntryMetrics { bool bText; @@ -663,7 +603,6 @@ struct ImplEntryMetrics long nImgHeight; }; - void ImplListBoxWindow::EnableQuickSelection( const bool& b ) { maQuickSelectionEngine.SetEnabled( b ); @@ -751,8 +690,6 @@ void ImplListBoxWindow::ImplUpdateEntryMetrics( ImplEntryType& rEntry ) rEntry.mnHeight = aMetrics.nEntryHeight; } - - void ImplListBoxWindow::ImplCallSelect() { if ( !IsTravelSelect() && GetEntryList()->GetMaxMRUCount() ) @@ -794,8 +731,6 @@ void ImplListBoxWindow::ImplCallSelect() mbSelectionChanged = false; } - - sal_uInt16 ImplListBoxWindow::InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry ) { ImplClearLayoutData(); @@ -808,8 +743,6 @@ sal_uInt16 ImplListBoxWindow::InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewE return nNewPos; } - - void ImplListBoxWindow::RemoveEntry( sal_uInt16 nPos ) { ImplClearLayoutData(); @@ -819,8 +752,6 @@ void ImplListBoxWindow::RemoveEntry( sal_uInt16 nPos ) ImplCalcMetrics(); } - - void ImplListBoxWindow::SetEntryFlags( sal_uInt16 nPos, long nFlags ) { mpEntryList->SetEntryFlags( nPos, nFlags ); @@ -829,8 +760,6 @@ void ImplListBoxWindow::SetEntryFlags( sal_uInt16 nPos, long nFlags ) ImplUpdateEntryMetrics( *pEntry ); } - - void ImplListBoxWindow::ImplShowFocusRect() { if ( mbHasFocusRect ) @@ -839,8 +768,6 @@ void ImplListBoxWindow::ImplShowFocusRect() mbHasFocusRect = true; } - - void ImplListBoxWindow::ImplHideFocusRect() { if ( mbHasFocusRect ) @@ -850,9 +777,6 @@ void ImplListBoxWindow::ImplHideFocusRect() } } - - - sal_uInt16 ImplListBoxWindow::GetEntryPosForPoint( const Point& rPoint ) const { long nY = mnBorder; @@ -870,8 +794,6 @@ sal_uInt16 ImplListBoxWindow::GetEntryPosForPoint( const Point& rPoint ) const return nSelect; } - - bool ImplListBoxWindow::IsVisible( sal_uInt16 i_nEntry ) const { bool bRet = false; @@ -888,8 +810,6 @@ bool ImplListBoxWindow::IsVisible( sal_uInt16 i_nEntry ) const return bRet; } - - sal_uInt16 ImplListBoxWindow::GetLastVisibleEntry() const { sal_uInt16 nPos = mnTop; @@ -908,8 +828,6 @@ sal_uInt16 ImplListBoxWindow::GetLastVisibleEntry() const return nPos; } - - void ImplListBoxWindow::MouseButtonDown( const MouseEvent& rMEvt ) { mbMouseMoveSelect = false; // only till the first MouseButtonDown @@ -949,8 +867,6 @@ void ImplListBoxWindow::MouseButtonDown( const MouseEvent& rMEvt ) } } - - void ImplListBoxWindow::MouseMove( const MouseEvent& rMEvt ) { if ( rMEvt.IsLeaveWindow() ) @@ -1030,8 +946,6 @@ void ImplListBoxWindow::MouseMove( const MouseEvent& rMEvt ) } } - - void ImplListBoxWindow::DeselectAll() { while ( GetEntryList()->GetSelectEntryCount() ) @@ -1041,8 +955,6 @@ void ImplListBoxWindow::DeselectAll() } } - - void ImplListBoxWindow::SelectEntry( sal_uInt16 nPos, bool bSelect ) { if( (mpEntryList->IsEntryPosSelected( nPos ) != bSelect) && mpEntryList->IsEntrySelectable( nPos ) ) @@ -1092,8 +1004,6 @@ void ImplListBoxWindow::SelectEntry( sal_uInt16 nPos, bool bSelect ) } } - - bool ImplListBoxWindow::SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLET, bool bShift, bool bCtrl, bool bSelectPosChange /*=FALSE*/ ) { bool bFocusChanged = false; @@ -1249,8 +1159,6 @@ bool ImplListBoxWindow::SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLET, b return bSelectionChanged; } - - void ImplListBoxWindow::Tracking( const TrackingEvent& rTEvt ) { Point aPoint; @@ -1417,17 +1325,12 @@ void ImplListBoxWindow::Tracking( const TrackingEvent& rTEvt ) } } - - - void ImplListBoxWindow::KeyInput( const KeyEvent& rKEvt ) { if( !ProcessKeyInput( rKEvt ) ) Control::KeyInput( rKEvt ); } - - bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) { // entry to be selected @@ -1738,20 +1641,17 @@ namespace } } - ::vcl::StringEntryIdentifier ImplListBoxWindow::CurrentEntry( OUString& _out_entryText ) const { return lcl_getEntry( *GetEntryList(), ( mnCurrentPos == LISTBOX_ENTRY_NOTFOUND ) ? 0 : mnCurrentPos + 1, _out_entryText ); } - ::vcl::StringEntryIdentifier ImplListBoxWindow::NextEntry( ::vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const { sal_uInt16 nNextPos = lcl_getEntryPos( _currentEntry ) + 1; return lcl_getEntry( *GetEntryList(), nNextPos, _out_entryText ); } - void ImplListBoxWindow::SelectEntry( ::vcl::StringEntryIdentifier _entry ) { sal_uInt16 nSelect = lcl_getEntryPos( _entry ); @@ -1781,8 +1681,6 @@ void ImplListBoxWindow::SelectEntry( ::vcl::StringEntryIdentifier _entry ) } } - - void ImplListBoxWindow::ImplPaint( sal_uInt16 nPos, bool bErase, bool bLayout ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -1838,8 +1736,6 @@ void ImplListBoxWindow::ImplPaint( sal_uInt16 nPos, bool bErase, bool bLayout ) } } - - void ImplListBoxWindow::DrawEntry( sal_uInt16 nPos, bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos, bool bLayout ) { const ImplEntryType* pEntry = mpEntryList->GetEntryPtr( nPos ); @@ -1958,8 +1854,6 @@ void ImplListBoxWindow::DrawEntry( sal_uInt16 nPos, bool bDrawImage, bool bDrawT } } - - void ImplListBoxWindow::FillLayoutData() const { mpControlData->mpLayoutData = new vcl::ControlLayoutData(); @@ -1967,8 +1861,6 @@ void ImplListBoxWindow::FillLayoutData() const ImplDoPaint( Rectangle( Point( 0, 0 ), GetOutputSize() ), true ); } - - void ImplListBoxWindow::ImplDoPaint( const Rectangle& rRect, bool bLayout ) { sal_uInt16 nCount = mpEntryList->GetEntryCount(); @@ -1999,15 +1891,11 @@ void ImplListBoxWindow::ImplDoPaint( const Rectangle& rRect, bool bLayout ) ImplShowFocusRect(); } - - void ImplListBoxWindow::Paint( const Rectangle& rRect ) { ImplDoPaint( rRect ); } - - sal_uInt16 ImplListBoxWindow::GetDisplayLineCount() const { // FIXME: LISTBOX_ENTRY_FLAG_MULTILINE @@ -2021,8 +1909,6 @@ sal_uInt16 ImplListBoxWindow::GetDisplayLineCount() const return nEntries; } - - void ImplListBoxWindow::Resize() { Control::Resize(); @@ -2043,8 +1929,6 @@ void ImplListBoxWindow::Resize() ImplClearLayoutData(); } - - void ImplListBoxWindow::GetFocus() { sal_uInt16 nPos = mnCurrentPos; @@ -2058,16 +1942,12 @@ void ImplListBoxWindow::GetFocus() Control::GetFocus(); } - - void ImplListBoxWindow::LoseFocus() { ImplHideFocusRect(); Control::LoseFocus(); } - - void ImplListBoxWindow::SetTopEntry( sal_uInt16 nTop ) { if( mpEntryList->GetEntryCount() == 0 ) @@ -2097,8 +1977,6 @@ void ImplListBoxWindow::SetTopEntry( sal_uInt16 nTop ) } } - - void ImplListBoxWindow::ShowProminentEntry( sal_uInt16 nEntryPos ) { if( meProminentType == PROMINENT_MIDDLE ) @@ -2111,15 +1989,11 @@ void ImplListBoxWindow::ShowProminentEntry( sal_uInt16 nEntryPos ) SetTopEntry( nEntryPos ); } - - void ImplListBoxWindow::SetLeftIndent( long n ) { ScrollHorz( n - mnLeft ); } - - void ImplListBoxWindow::ScrollHorz( long n ) { long nDiff = 0; @@ -2152,8 +2026,6 @@ void ImplListBoxWindow::ScrollHorz( long n ) } } - - Size ImplListBoxWindow::CalcSize(sal_Int32 nMaxLines) const { // FIXME: LISTBOX_ENTRY_FLAG_MULTILINE @@ -2164,8 +2036,6 @@ Size ImplListBoxWindow::CalcSize(sal_Int32 nMaxLines) const return aSz; } - - Rectangle ImplListBoxWindow::GetBoundingRectangle( sal_uInt16 nItem ) const { const ImplEntryType* pEntry = mpEntryList->GetEntryPtr( nItem ); @@ -2175,8 +2045,6 @@ Rectangle ImplListBoxWindow::GetBoundingRectangle( sal_uInt16 nItem ) const return aRect; } - - void ImplListBoxWindow::StateChanged( StateChangedType nType ) { Control::StateChanged( nType ); @@ -2211,8 +2079,6 @@ void ImplListBoxWindow::StateChanged( StateChangedType nType ) ImplClearLayoutData(); } - - void ImplListBoxWindow::DataChanged( const DataChangedEvent& rDCEvt ) { Control::DataChanged( rDCEvt ); @@ -2229,8 +2095,6 @@ void ImplListBoxWindow::DataChanged( const DataChangedEvent& rDCEvt ) } } - - sal_uInt16 ImplListBoxWindow::ImplGetTextStyle() const { sal_uInt16 nTextStyle = TEXT_DRAW_VCENTER; @@ -2247,8 +2111,6 @@ sal_uInt16 ImplListBoxWindow::ImplGetTextStyle() const return nTextStyle; } - - ImplListBox::ImplListBox( Window* pParent, WinBits nWinStyle ) : Control( pParent, nWinStyle ), maLBWindow( this, nWinStyle&(~WB_BORDER) ) @@ -2275,8 +2137,6 @@ ImplListBox::ImplListBox( Window* pParent, WinBits nWinStyle ) : maLBWindow.Show(); } - - ImplListBox::~ImplListBox() { delete mpHScrollBar; @@ -2284,8 +2144,6 @@ ImplListBox::~ImplListBox() delete mpScrollBarBox; } - - void ImplListBox::Clear() { maLBWindow.Clear(); @@ -2299,8 +2157,6 @@ void ImplListBox::Clear() StateChanged( STATE_CHANGE_DATA ); } - - sal_uInt16 ImplListBox::InsertEntry( sal_uInt16 nPos, const OUString& rStr ) { ImplEntryType* pNewEntry = new ImplEntryType( rStr ); @@ -2309,8 +2165,6 @@ sal_uInt16 ImplListBox::InsertEntry( sal_uInt16 nPos, const OUString& rStr ) return nNewPos; } - - sal_uInt16 ImplListBox::InsertEntry( sal_uInt16 nPos, const OUString& rStr, const Image& rImage ) { ImplEntryType* pNewEntry = new ImplEntryType( rStr, rImage ); @@ -2319,51 +2173,37 @@ sal_uInt16 ImplListBox::InsertEntry( sal_uInt16 nPos, const OUString& rStr, cons return nNewPos; } - - void ImplListBox::RemoveEntry( sal_uInt16 nPos ) { maLBWindow.RemoveEntry( nPos ); StateChanged( STATE_CHANGE_DATA ); } - - void ImplListBox::SetEntryFlags( sal_uInt16 nPos, long nFlags ) { maLBWindow.SetEntryFlags( nPos, nFlags ); } - - void ImplListBox::SelectEntry( sal_uInt16 nPos, bool bSelect ) { maLBWindow.SelectEntry( nPos, bSelect ); } - - void ImplListBox::SetNoSelection() { maLBWindow.DeselectAll(); } - - void ImplListBox::GetFocus() { maLBWindow.GrabFocus(); } - - Window* ImplListBox::GetPreferredKeyInputWindow() { return &maLBWindow; } - - void ImplListBox::Resize() { Control::Resize(); @@ -2371,17 +2211,12 @@ void ImplListBox::Resize() ImplCheckScrollBars(); } - - - IMPL_LINK_NOARG(ImplListBox, MRUChanged) { StateChanged( STATE_CHANGE_DATA ); return 1; } - - IMPL_LINK_NOARG(ImplListBox, LBWindowScrolled) { long nSet = GetTopEntry(); @@ -2396,8 +2231,6 @@ IMPL_LINK_NOARG(ImplListBox, LBWindowScrolled) return 1; } - - IMPL_LINK( ImplListBox, ScrollBarHdl, ScrollBar*, pSB ) { sal_uInt16 nPos = (sal_uInt16) pSB->GetThumbPos(); @@ -2409,8 +2242,6 @@ IMPL_LINK( ImplListBox, ScrollBarHdl, ScrollBar*, pSB ) return 1; } - - void ImplListBox::ImplCheckScrollBars() { bool bArrange = false; @@ -2492,8 +2323,6 @@ void ImplListBox::ImplCheckScrollBars() ImplInitScrollBars(); } - - void ImplListBox::ImplInitScrollBars() { Size aOutSz = maLBWindow.GetOutputSizePixel(); @@ -2516,8 +2345,6 @@ void ImplListBox::ImplInitScrollBars() } } - - void ImplListBox::ImplResizeControls() { // Here we only position the Controls; if the Scrollbars are to be @@ -2580,8 +2407,6 @@ void ImplListBox::ImplResizeControls() } } - - void ImplListBox::StateChanged( StateChangedType nType ) { if ( nType == STATE_CHANGE_INITSHOW ) @@ -2630,15 +2455,11 @@ void ImplListBox::StateChanged( StateChangedType nType ) Control::StateChanged( nType ); } - - void ImplListBox::DataChanged( const DataChangedEvent& rDCEvt ) { Control::DataChanged( rDCEvt ); } - - bool ImplListBox::Notify( NotifyEvent& rNEvt ) { bool nDone = false; @@ -2658,15 +2479,11 @@ bool ImplListBox::Notify( NotifyEvent& rNEvt ) return nDone || Window::Notify( rNEvt ); } - - const Wallpaper& ImplListBox::GetDisplayBackground() const { return maLBWindow.GetDisplayBackground(); } - - bool ImplListBox::HandleWheelAsCursorTravel( const CommandEvent& rCEvt ) { bool bDone = false; @@ -2683,8 +2500,6 @@ bool ImplListBox::HandleWheelAsCursorTravel( const CommandEvent& rCEvt ) return bDone; } - - void ImplListBox::SetMRUEntries( const OUString& rEntries, sal_Unicode cSep ) { bool bChanges = GetEntryList()->GetMRUCount() ? true : false; @@ -2716,8 +2531,6 @@ void ImplListBox::SetMRUEntries( const OUString& rEntries, sal_Unicode cSep ) } } - - OUString ImplListBox::GetMRUEntries( sal_Unicode cSep ) const { OUStringBuffer aEntries; @@ -2730,8 +2543,6 @@ OUString ImplListBox::GetMRUEntries( sal_Unicode cSep ) const return aEntries.makeStringAndClear(); } - - void ImplListBox::SetEdgeBlending(bool bNew) { if(mbEdgeBlending != bNew) @@ -2741,8 +2552,6 @@ void ImplListBox::SetEdgeBlending(bool bNew) } } - - ImplWin::ImplWin( Window* pParent, WinBits nWinStyle ) : Control ( pParent, nWinStyle ) { @@ -2758,16 +2567,12 @@ ImplWin::ImplWin( Window* pParent, WinBits nWinStyle ) : mnItemPos = LISTBOX_ENTRY_NOTFOUND; } - - void ImplWin::MBDown() { if( IsEnabled() ) maMBDownHdl.Call( this ); } - - void ImplWin::MouseButtonDown( const MouseEvent& ) { if( IsEnabled() ) @@ -2776,16 +2581,12 @@ void ImplWin::MouseButtonDown( const MouseEvent& ) } } - - void ImplWin::FillLayoutData() const { mpControlData->mpLayoutData = new vcl::ControlLayoutData(); const_cast<ImplWin*>(this)->ImplDraw( true ); } - - bool ImplWin::PreNotify( NotifyEvent& rNEvt ) { const MouseEvent* pMouseEvt = NULL; @@ -2807,8 +2608,6 @@ bool ImplWin::PreNotify( NotifyEvent& rNEvt ) return Control::PreNotify(rNEvt); } - - void ImplWin::ImplDraw( bool bLayout ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -2918,15 +2717,11 @@ void ImplWin::ImplDraw( bool bLayout ) } } - - void ImplWin::Paint( const Rectangle& ) { ImplDraw(); } - - void ImplWin::DrawEntry( bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos, bool bLayout ) { long nBorder = 1; @@ -3000,8 +2795,6 @@ void ImplWin::DrawEntry( bool bDrawImage, bool bDrawText, bool bDrawTextAtImageP ShowFocus( maFocusRect ); } - - void ImplWin::Resize() { Control::Resize(); @@ -3009,8 +2802,6 @@ void ImplWin::Resize() Invalidate(); } - - void ImplWin::GetFocus() { ShowFocus( maFocusRect ); @@ -3028,8 +2819,6 @@ void ImplWin::GetFocus() Control::GetFocus(); } - - void ImplWin::LoseFocus() { HideFocus(); @@ -3047,24 +2836,18 @@ void ImplWin::LoseFocus() Control::LoseFocus(); } - - ImplBtn::ImplBtn( Window* pParent, WinBits nWinStyle ) : PushButton( pParent, nWinStyle ), mbDown ( false ) { } - - void ImplBtn::MBDown() { if( IsEnabled() ) maMBDownHdl.Call( this ); } - - void ImplBtn::MouseButtonDown( const MouseEvent& ) { //PushButton::MouseButtonDown( rMEvt ); @@ -3075,8 +2858,6 @@ void ImplBtn::MouseButtonDown( const MouseEvent& ) } } - - ImplListBoxFloatingWindow::ImplListBoxFloatingWindow( Window* pParent ) : FloatingWindow( pParent, WB_BORDER | WB_SYSTEMWINDOW | WB_NOSHADOW ) // no drop shadow for list boxes { @@ -3101,8 +2882,6 @@ ImplListBoxFloatingWindow::ImplListBoxFloatingWindow( Window* pParent ) : } - - bool ImplListBoxFloatingWindow::PreNotify( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == EVENT_LOSEFOCUS ) @@ -3114,8 +2893,6 @@ bool ImplListBoxFloatingWindow::PreNotify( NotifyEvent& rNEvt ) return FloatingWindow::PreNotify( rNEvt ); } - - void ImplListBoxFloatingWindow::setPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) { FloatingWindow::setPosSizePixel( nX, nY, nWidth, nHeight, nFlags ); @@ -3150,16 +2927,12 @@ void ImplListBoxFloatingWindow::setPosSizePixel( long nX, long nY, long nWidth, } } - - void ImplListBoxFloatingWindow::Resize() { mpImplLB->GetMainWindow()->ImplClearLayoutData(); FloatingWindow::Resize(); } - - Size ImplListBoxFloatingWindow::CalcFloatSize() { Size aFloatSz( maPrefSz ); @@ -3232,8 +3005,6 @@ Size ImplListBoxFloatingWindow::CalcFloatSize() return aFloatSz; } - - void ImplListBoxFloatingWindow::StartFloat( bool bStartTracking ) { if( !IsInPopupMode() ) diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx index 1e3441a01705..f143ab13331d 100644 --- a/vcl/source/control/imgctrl.cxx +++ b/vcl/source/control/imgctrl.cxx @@ -26,24 +26,18 @@ namespace ImageScaleMode = ::com::sun::star::awt::ImageScaleMode; - - ImageControl::ImageControl( Window* pParent, WinBits nStyle ) :FixedImage( pParent, nStyle ) ,mnScaleMode( ImageScaleMode::ANISOTROPIC ) { } - - ImageControl::ImageControl( Window* pParent, const ResId& rResId ) :FixedImage( pParent, rResId ) ,mnScaleMode( ImageScaleMode::ANISOTROPIC ) { } - - void ImageControl::SetScaleMode( const ::sal_Int16 _nMode ) { if ( _nMode != mnScaleMode ) @@ -53,14 +47,11 @@ void ImageControl::SetScaleMode( const ::sal_Int16 _nMode ) } } - - void ImageControl::Resize() { Invalidate(); } - namespace { static Size lcl_calcPaintSize( const Rectangle& _rPaintRect, const Size& _rBitmapSize ) @@ -83,8 +74,6 @@ namespace } } - - void ImageControl::ImplDraw( OutputDevice& rDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize ) const { sal_uInt16 nStyle = 0; @@ -149,8 +138,6 @@ void ImageControl::ImplDraw( OutputDevice& rDev, sal_uLong nDrawFlags, const Poi } // switch ( mnScaleMode ) } - - void ImageControl::Paint( const Rectangle& /*rRect*/ ) { ImplDraw( *this, 0, Point(), GetOutputSizePixel() ); @@ -177,7 +164,6 @@ void ImageControl::Paint( const Rectangle& /*rRect*/ ) } } - void ImageControl::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { const Point aPos = pDev->LogicToPixel( rPos ); @@ -198,16 +184,12 @@ void ImageControl::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSiz pDev->Pop(); } - - void ImageControl::GetFocus() { FixedImage::GetFocus(); GetWindow( WINDOW_BORDER )->Invalidate(); } - - void ImageControl::LoseFocus() { FixedImage::GetFocus(); diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx index 905348116f14..6ecc05d68671 100644 --- a/vcl/source/control/spinbtn.cxx +++ b/vcl/source/control/spinbtn.cxx @@ -23,8 +23,6 @@ #include <vcl/spin.hxx> #include <vcl/settings.hxx> - - void SpinButton::ImplInit( Window* pParent, WinBits nStyle ) { mbUpperIn = false; @@ -50,8 +48,6 @@ void SpinButton::ImplInit( Window* pParent, WinBits nStyle ) Control::ImplInit( pParent, nStyle, NULL ); } - - SpinButton::SpinButton( Window* pParent, WinBits nStyle ) :Control( WINDOW_SPINBUTTON ) ,mbUpperIsFocused( false ) @@ -59,14 +55,10 @@ SpinButton::SpinButton( Window* pParent, WinBits nStyle ) ImplInit( pParent, nStyle ); } - - SpinButton::~SpinButton() { } - - IMPL_LINK( SpinButton, ImplTimeout, Timer*, pTimer ) { if ( pTimer->GetTimeout() == GetSettings().GetMouseSettings().GetButtonStartRepeat() ) @@ -85,8 +77,6 @@ IMPL_LINK( SpinButton, ImplTimeout, Timer*, pTimer ) return 0; } - - void SpinButton::Up() { if ( ImplIsUpperEnabled() ) @@ -100,8 +90,6 @@ void SpinButton::Up() ImplCallEventListenersAndHandler( VCLEVENT_SPINBUTTON_UP, maUpHdlLink, this ); } - - void SpinButton::Down() { if ( ImplIsLowerEnabled() ) @@ -115,8 +103,6 @@ void SpinButton::Down() ImplCallEventListenersAndHandler( VCLEVENT_SPINBUTTON_DOWN, maDownHdlLink, this ); } - - void SpinButton::Resize() { Control::Resize(); @@ -140,8 +126,6 @@ void SpinButton::Resize() Invalidate(); } - - void SpinButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { Point aPos = pDev->LogicToPixel( rPos ); @@ -199,8 +183,6 @@ void SpinButton::Paint( const Rectangle& ) ShowFocus( maFocusRect ); } - - void SpinButton::MouseButtonDown( const MouseEvent& rMEvt ) { if ( maUpperRect.IsInside( rMEvt.GetPosPixel() ) && ( ImplIsUpperEnabled() ) ) @@ -225,8 +207,6 @@ void SpinButton::MouseButtonDown( const MouseEvent& rMEvt ) } } - - void SpinButton::MouseButtonUp( const MouseEvent& ) { ReleaseMouse(); @@ -254,8 +234,6 @@ void SpinButton::MouseButtonUp( const MouseEvent& ) mbInitialUp = mbInitialDown = false; } - - void SpinButton::MouseMove( const MouseEvent& rMEvt ) { if ( !rMEvt.IsLeft() || (!mbInitialUp && !mbInitialDown) ) @@ -297,8 +275,6 @@ void SpinButton::MouseMove( const MouseEvent& rMEvt ) } } - - void SpinButton::KeyInput( const KeyEvent& rKEvt ) { if ( !rKEvt.GetKeyCode().GetModifier() ) @@ -336,8 +312,6 @@ void SpinButton::KeyInput( const KeyEvent& rKEvt ) Control::KeyInput( rKEvt ); } - - void SpinButton::StateChanged( StateChangedType nType ) { switch ( nType ) @@ -373,22 +347,16 @@ void SpinButton::StateChanged( StateChangedType nType ) Control::StateChanged( nType ); } - - void SpinButton::SetRangeMin( long nNewRange ) { SetRange( Range( nNewRange, GetRangeMax() ) ); } - - void SpinButton::SetRangeMax( long nNewRange ) { SetRange( Range( GetRangeMin(), nNewRange ) ); } - - void SpinButton::SetRange( const Range& rRange ) { // adjust rage @@ -414,8 +382,6 @@ void SpinButton::SetRange( const Range& rRange ) } } - - void SpinButton::SetValue( long nValue ) { // adjust, if necessary @@ -431,24 +397,18 @@ void SpinButton::SetValue( long nValue ) } } - - void SpinButton::GetFocus() { ShowFocus( maFocusRect ); Control::GetFocus(); } - - void SpinButton::LoseFocus() { HideFocus(); Control::LoseFocus(); } - - bool SpinButton::ImplMoveFocus( bool _bUpper ) { if ( _bUpper == mbUpperIsFocused ) @@ -461,8 +421,6 @@ bool SpinButton::ImplMoveFocus( bool _bUpper ) return true; } - - void SpinButton::ImplCalcFocusRect( bool _bUpper ) { maFocusRect = _bUpper ? maUpperRect : maLowerRect; @@ -474,8 +432,6 @@ void SpinButton::ImplCalcFocusRect( bool _bUpper ) mbUpperIsFocused = _bUpper; } - - Rectangle* SpinButton::ImplFindPartRect( const Point& rPt ) { if( maUpperRect.IsInside( rPt ) ) @@ -523,6 +479,4 @@ bool SpinButton::PreNotify( NotifyEvent& rNEvt ) return Control::PreNotify(rNEvt); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx index 47962c368793..7576b2bae17c 100644 --- a/vcl/source/filter/FilterConfigCache.cxx +++ b/vcl/source/filter/FilterConfigCache.cxx @@ -300,8 +300,6 @@ void FilterConfigCache::ImplInitSmart() } } - - FilterConfigCache::FilterConfigCache( bool bConfig ) : bUseConfig ( bConfig ) { @@ -556,6 +554,4 @@ bool FilterConfigCache::IsExportPixelFormat( sal_uInt16 nFormat ) return (nFormat < aExport.size()) && aExport[ nFormat ].bIsPixelFormat; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/filter/GraphicNativeMetadata.cxx b/vcl/source/filter/GraphicNativeMetadata.cxx index 1339ec81c854..785f89c1b5e0 100644 --- a/vcl/source/filter/GraphicNativeMetadata.cxx +++ b/vcl/source/filter/GraphicNativeMetadata.cxx @@ -54,5 +54,4 @@ bool GraphicNativeMetadata::read(Graphic& rGraphic) return true; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/filter/igif/decode.cxx b/vcl/source/filter/igif/decode.cxx index db1bc12725bb..0dcd86d24df5 100644 --- a/vcl/source/filter/igif/decode.cxx +++ b/vcl/source/filter/igif/decode.cxx @@ -20,8 +20,6 @@ #include "decode.hxx" - - struct GIFLZWTableEntry { GIFLZWTableEntry* pPrev; @@ -29,8 +27,6 @@ struct GIFLZWTableEntry sal_uInt8 nData; }; - - GIFLZWDecompressor::GIFLZWDecompressor( sal_uInt8 cDataSize ) : nInputBitsBuf ( 0 ), nOutBufDataLen ( 0 ), @@ -57,16 +53,12 @@ GIFLZWDecompressor::GIFLZWDecompressor( sal_uInt8 cDataSize ) : } } - - GIFLZWDecompressor::~GIFLZWDecompressor() { delete[] pOutBuf; delete[] pTable; } - - HPBYTE GIFLZWDecompressor::DecompressBlock( HPBYTE pSrc, sal_uInt8 cBufSize, sal_uLong& rCount, bool& rEOI ) { @@ -111,8 +103,6 @@ HPBYTE GIFLZWDecompressor::DecompressBlock( HPBYTE pSrc, sal_uInt8 cBufSize, return pTarget; } - - void GIFLZWDecompressor::AddToTable( sal_uInt16 nPrevCode, sal_uInt16 nCodeFirstData ) { GIFLZWTableEntry* pE; @@ -130,8 +120,6 @@ void GIFLZWDecompressor::AddToTable( sal_uInt16 nPrevCode, sal_uInt16 nCodeFirst } } - - bool GIFLZWDecompressor::ProcessOneCode() { GIFLZWTableEntry* pE; diff --git a/vcl/source/filter/ixbm/xbmread.cxx b/vcl/source/filter/ixbm/xbmread.cxx index 3b94c802b343..89f0d06bfcd4 100644 --- a/vcl/source/filter/ixbm/xbmread.cxx +++ b/vcl/source/filter/ixbm/xbmread.cxx @@ -23,10 +23,6 @@ #include <comphelper/string.hxx> #include "xbmread.hxx" - -// - XBMReader - - - XBMReader::XBMReader( SvStream& rStm ) : rIStm ( rStm ), pAcc1 ( NULL ), @@ -40,8 +36,6 @@ XBMReader::XBMReader( SvStream& rStm ) : InitTable(); } - - XBMReader::~XBMReader() { delete[] pHexTable; @@ -50,8 +44,6 @@ XBMReader::~XBMReader() aBmp1.ReleaseAccess( pAcc1 ); } - - void XBMReader::InitTable() { memset( pHexTable, 0, sizeof( short ) * 256 ); @@ -88,8 +80,6 @@ void XBMReader::InitTable() pHexTable[(int)'\0'] = -1; } - - OString XBMReader::FindTokenLine( SvStream* pInStm, const char* pTok1, const char* pTok2, const char* pTok3 ) { @@ -135,8 +125,6 @@ OString XBMReader::FindTokenLine( SvStream* pInStm, const char* pTok1, return aRet; } - - long XBMReader::ParseDefine( const sal_Char* pDefine ) { long nRet = 0; @@ -184,8 +172,6 @@ long XBMReader::ParseDefine( const sal_Char* pDefine ) return nRet; } - - bool XBMReader::ParseData( SvStream* pInStm, const OString& aLastLine, XBMFormat eFormat ) { OString aLine; @@ -257,8 +243,6 @@ bool XBMReader::ParseData( SvStream* pInStm, const OString& aLastLine, XBMFormat return true; } - - ReadState XBMReader::ReadXBM( Graphic& rGraphic ) { ReadState eReadState; @@ -353,10 +337,6 @@ ReadState XBMReader::ReadXBM( Graphic& rGraphic ) return eReadState; } - -// - ImportXBM - - - bool ImportXBM( SvStream& rStm, Graphic& rGraphic ) { XBMReader* pXBMReader = (XBMReader*) rGraphic.GetContext(); diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx index 9d3ad23145c4..5ed2f7425561 100644 --- a/vcl/source/filter/ixpm/xpmread.cxx +++ b/vcl/source/filter/ixpm/xpmread.cxx @@ -24,10 +24,6 @@ #define _XPMPRIVATE #include "xpmread.hxx" - -// - XPMReader - - - XPMReader::XPMReader( SvStream& rStm ) : mrIStm ( rStm ), mpAcc ( NULL ), @@ -49,8 +45,6 @@ XPMReader::XPMReader( SvStream& rStm ) : } - - XPMReader::~XPMReader() { if( mpAcc ) diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx index 78a96d43eeeb..c7e28ab8bad1 100644 --- a/vcl/source/filter/jpeg/JpegWriter.cxx +++ b/vcl/source/filter/jpeg/JpegWriter.cxx @@ -250,5 +250,4 @@ bool JPEGWriter::Write( const Graphic& rGraphic ) return bRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/filter/sgfbram.cxx b/vcl/source/filter/sgfbram.cxx index 111482add734..bacb9a4d9c26 100644 --- a/vcl/source/filter/sgfbram.cxx +++ b/vcl/source/filter/sgfbram.cxx @@ -171,11 +171,6 @@ SvStream& WriteRGBQuad(SvStream& rOStream, const RGBQuad& rQuad) return rOStream; } - - -// PcxExpand - - class PcxExpand { private: @@ -203,10 +198,6 @@ sal_uInt8 PcxExpand::GetByte(SvStream& rInp) return Data; } - -// SgfBMapFilter - - bool SgfFilterBMap(SvStream& rInp, SvStream& rOut, SgfHeader& rHead, SgfEntry&) { BmpFileHeader aBmpHead; @@ -370,11 +361,6 @@ bool SgfBMapFilter(SvStream& rInp, SvStream& rOut) return(bRet); } - - -// SgfVectFilter - - // for StarDraw embedded SGF vector long SgfVectXofs=0; long SgfVectYofs=0; @@ -384,10 +370,6 @@ long SgfVectXdiv=0; long SgfVectYdiv=0; bool SgfVectScal=false; - -// Hpgl2SvFarbe - - Color Hpgl2SvFarbe( sal_uInt8 nFarb ) { sal_uLong nColor = COL_BLACK; diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx index 2dd014686fcf..d2c42cc6131a 100644 --- a/vcl/source/filter/sgvmain.cxx +++ b/vcl/source/filter/sgvmain.cxx @@ -83,8 +83,6 @@ #endif - - // Restrictions: // - area patterns are matched to the available ones in Starview. @@ -93,16 +91,10 @@ // transparency/opacity is not taken into account // - no rotated ellipses - - - // for font translation - SgfFontLst* pSgfFonts = 0; - // for circle kinds, text and rotated rectangles - void RotatePoint(PointType& P, sal_Int16 cx, sal_Int16 cy, double sn, double cs) { sal_Int16 dx,dy; @@ -140,10 +132,8 @@ sal_uInt16 MulDiv(sal_uInt16 a, sal_uInt16 Mul, sal_uInt16 Div) return sal_uInt16(Temp); } - // SgfFilterSDrw - SvStream& ReadDtHdType(SvStream& rIStream, DtHdType& rDtHd) { rIStream.Read((char*)&rDtHd.Reserved[0],DtHdSize); @@ -305,13 +295,6 @@ SvStream& ReadGrupType(SvStream& rInp, GrupType& rGrup) return rInp; } - - -/************************************************************************* -|* -|* Sgv2SvFarbe() -|* -*************************************************************************/ Color Sgv2SvFarbe(sal_uInt8 nFrb1, sal_uInt8 nFrb2, sal_uInt8 nInts) { sal_uInt16 r1=0,g1=0,b1=0,r2=0,g2=0,b2=0; @@ -359,33 +342,18 @@ void SetArea(ObjAreaType& rArea, OutputDevice& rOut) rOut.SetFillColor( Sgv2SvFarbe( rArea.FFarbe,rArea.FBFarbe,rArea.FIntens ) ); } -/************************************************************************* -|* -|* ObjkType::DrawObjekt() -|* -*************************************************************************/ void ObjkType::Draw(OutputDevice&) { } void Obj0Type::Draw(OutputDevice&) {} -/************************************************************************* -|* -|* StrkType::DrawObjekt() -|* -*************************************************************************/ void StrkType::Draw(OutputDevice& rOut) { SetLine(L,rOut); rOut.DrawLine(Point(Pos1.x,Pos1.y),Point(Pos2.x,Pos2.y)); // !!! } -/************************************************************************* -|* -|* RectType::DrawObjekt() -|* -*************************************************************************/ void SgfAreaColorIntens(sal_uInt16 Muster, sal_uInt8 Col1, sal_uInt8 Col2, sal_uInt8 Int, OutputDevice& rOut) { ObjAreaType F; @@ -479,7 +447,6 @@ void DrawSlideRect(sal_Int16 x1, sal_Int16 y1, sal_Int16 x2, sal_Int16 y2, ObjAr } } - void RectType::Draw(OutputDevice& rOut) { if (L.LMuster!=0) L.LMuster=1; // no line separator here, only on or off @@ -515,11 +482,6 @@ void RectType::Draw(OutputDevice& rOut) } } -/************************************************************************* -|* -|* PolyType::Draw() -|* -*************************************************************************/ void PolyType::Draw(OutputDevice& rOut) { if ((Flags & PolyClosBit) !=0) SetArea(F,rOut); @@ -534,11 +496,6 @@ void PolyType::Draw(OutputDevice& rOut) } } -/************************************************************************* -|* -|* SplnType::Draw() -|* -*************************************************************************/ void SplnType::Draw(OutputDevice& rOut) { if ((Flags & PolyClosBit) !=0) SetArea(F,rOut); @@ -556,11 +513,6 @@ void SplnType::Draw(OutputDevice& rOut) } } -/************************************************************************* -|* -|* CircType::Draw() -|* -*************************************************************************/ void DrawSlideCirc(sal_Int16 cx, sal_Int16 cy, sal_Int16 rx, sal_Int16 ry, ObjAreaType& F, OutputDevice& rOut) { sal_Int16 x1=cx-rx; @@ -699,12 +651,6 @@ void CircType::Draw(OutputDevice& rOut) } } -/************************************************************************* -|* -|* BmapType::Draw() -|* -*************************************************************************/ - void BmapType::Draw(OutputDevice& rOut) { //ifstream aInp; @@ -751,21 +697,11 @@ void BmapType::Draw(OutputDevice& rOut) } -/************************************************************************* -|* -|* GrupType::... -|* -*************************************************************************/ sal_uInt32 GrupType::GetSubPtr() { return sal_uInt32(SbLo)+0x00010000*sal_uInt32(SbHi); } -/************************************************************************* -|* -|* DrawObjkList() -|* -*************************************************************************/ void DrawObjkList( SvStream& rInp, OutputDevice& rOut ) { ObjkType aObjk; @@ -846,11 +782,6 @@ void DrawObjkList( SvStream& rInp, OutputDevice& rOut ) } while (!bEnd); } -/************************************************************************* -|* -|* SkipObjkList() -|* -*************************************************************************/ void SkipObjkList(SvStream& rInp) { ObjkType aObjk; @@ -868,11 +799,6 @@ void SkipObjkList(SvStream& rInp) } while (aObjk.Next!=0L && !rInp.GetError()); } -/************************************************************************* -|* -|* SgfFilterSDrw() -|* -*************************************************************************/ bool SgfFilterSDrw( SvStream& rInp, SgfHeader&, SgfEntry&, GDIMetaFile& rMtf ) { bool bRet = false; @@ -922,13 +848,6 @@ bool SgfFilterSDrw( SvStream& rInp, SgfHeader&, SgfEntry&, GDIMetaFile& rMtf ) return bRet; } - - -/************************************************************************* -|* -|* SgfSDrwFilter() -|* -*************************************************************************/ bool SgfSDrwFilter(SvStream& rInp, GDIMetaFile& rMtf, INetURLObject aIniPath ) { #if OSL_DEBUG_LEVEL > 1 // check record size. New compiler possibly aligns different! diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx index 5baad793f12d..644286c70894 100644 --- a/vcl/source/filter/sgvtext.cxx +++ b/vcl/source/filter/sgvtext.cxx @@ -36,19 +36,8 @@ extern SgfFontLst* pSgfFonts; #endif - - // Limitations: only grey shadows, 2D and with fixed distance. - - - - - - - - - -// AbsBase.Pas +// Start of AbsBase.Pas // vvv special characters in text buffer vvv #define TextEnd 0 /* ^@ end of character sequence */ @@ -62,7 +51,6 @@ extern SgfFontLst* pSgfFonts; #define MaxEscValLen 8 #define MaxEscLen (MaxEscValLen+3) - // Escape sequences: [Esc]<Ident><Value>[Esc] at least 4 characters // Max length of value should be: 8 chars (7+sign). Therefore max. length // of a escape sequence: 11 chars. @@ -136,23 +124,13 @@ extern SgfFontLst* pSgfFonts; #define MaxChar 255 - - #define CharTopToBase 100 /* due to quotes more as 75% */ #define CharTopToBtm 120 /* line height larger as text angle */ // for Avanti-Bold 'ue' actually even 130% // end of AbsBase.Pas - - - - - - - - -// DefBase.Pas +// Start of DefBase.Pas #define TextBoldBit 0x0001 /* bold */ #define TextRSlnBit 0x0002 /* italic */ @@ -180,10 +158,6 @@ extern SgfFontLst* pSgfFonts; // end of DefBase.Pas - - - - bool CheckTextOutl(ObjAreaType& F, ObjLineType& L) { return (F.FIntens!=L.LIntens) || @@ -191,11 +165,7 @@ bool CheckTextOutl(ObjAreaType& F, ObjLineType& L) ((F.FBFarbe!=L.LBFarbe) && (F.FIntens<100)); } - - - - -// Misc.Pas +// Start of Misc.Pas short hPoint2Sgf(short a) { @@ -205,15 +175,14 @@ short hPoint2Sgf(short a) } // End of Misc.Pas -// AbsRead.Pas +// Start of AbsRead.Pas // Function GetTopToBaseLine() Function GetBaseLineToBtm() // Calculate distance from ascender of line to baseline or from baseline to // descender. All in SGF-units. - sal_uInt16 GetTopToBaseLine(sal_uInt16 MaxGrad) { long ret; @@ -221,7 +190,6 @@ sal_uInt16 GetTopToBaseLine(sal_uInt16 MaxGrad) return sal_uInt16(ret); } - // Function GetTextChar() Function GetTextCharConv() // Reads a character from textbuffer, in doing so escape sequences @@ -238,9 +206,6 @@ sal_uInt16 GetTopToBaseLine(sal_uInt16 MaxGrad) // in spaces, including HardTrenner in minus signs. TextEnde is // always returned as Char(0). - - - UCHAR ConvertTextChar(UCHAR c) { if (c<32) { @@ -273,8 +238,6 @@ long ChgValue(long Def, long Min, long Max, UCHAR FlgVal, long NumVal) return r; } - - void ChgSchnittBit(sal_uInt16 Bit, sal_uInt16 Radio1, sal_uInt16 Radio2, sal_uInt16 Radio3, UCHAR FlgVal, sal_uInt16 Schnitt0, sal_uInt16& Schnitt) { @@ -291,8 +254,6 @@ void ChgSchnittBit(sal_uInt16 Bit, sal_uInt16 Radio1, sal_uInt16 Radio2, sal_uIn } } - - UCHAR GetNextChar(UCHAR* TBuf, sal_uInt16 Index) { sal_uInt16 Cnt; @@ -306,8 +267,6 @@ UCHAR GetNextChar(UCHAR* TBuf, sal_uInt16 Index) return TBuf[Index]; } - - UCHAR ProcessOne(UCHAR* TBuf, sal_uInt16& Index, ObjTextType& Atr0, ObjTextType& AktAtr, bool ScanEsc) @@ -429,7 +388,6 @@ UCHAR GetTextChar(UCHAR* TBuf, sal_uInt16& Index, // is 3x present in TextBuf, e.g.: "schiff-fahrt". } // If not separated then, "-f" is removed. } - UCHAR GetTextCharConv(UCHAR* TBuf, sal_uInt16& Index, ObjTextType& Atr0, ObjTextType& AktAtr, sal_uInt16 Rest, bool ScanEsc) @@ -448,7 +406,6 @@ UCHAR GetTextCharConv(UCHAR* TBuf, sal_uInt16& Index, } - // Function GetLineFeed() // Required line spacing in SGF-Units. ChrVPos is taken into account. @@ -497,15 +454,7 @@ sal_uInt16 GetLineFeed(UCHAR* TBuf, sal_uInt16 Index, ObjTextType Atr0, ObjTextT // End of AbsRead.Pas - - - - - - - - -// iFont.Pas +// Start of iFont.Pas #define SuperSubFact 60 /* superscript/subscript: 60% of text angle */ #define DefaultSpace 40 /* Default: space is 40% of text angle */ @@ -614,14 +563,7 @@ sal_uInt16 SetTextContext(OutputDevice& rOut, ObjTextType& Atr, bool Kapt, sal_u // iFont.Pas - - - - - - - -// Absatz.Pas +// Start of Absatz.Pas struct ProcChrSta { sal_uInt16 Index; @@ -926,18 +868,9 @@ void FormatLine(UCHAR* TBuf, sal_uInt16& Index, ObjTextType& Atr0, ObjTextType& delete TRrec; } - - // End of Absatz.Pas - - - - - - - -// DrawText.Pas +// Start of DrawText.Pas void DrawChar(OutputDevice& rOut, UCHAR c, ObjTextType T, PointType Pos, sal_uInt16 DrehWink, sal_uInt16 FitXMul, sal_uInt16 FitXDiv, sal_uInt16 FitYMul, sal_uInt16 FitYDiv) @@ -949,11 +882,6 @@ void DrawChar(OutputDevice& rOut, UCHAR c, ObjTextType T, PointType Pos, sal_uIn rOut.DrawText( Point( Pos.x, Pos.y ), s ); } -/************************************************************************* -|* -|* TextType::Draw() -|* -*************************************************************************/ void TextType::Draw(OutputDevice& rOut) { if ((Flags & TextOutlBit)!=0) return; // source text for Outliner !! @@ -1073,9 +1001,6 @@ void TextType::Draw(OutputDevice& rOut) // End of DrawText.Pas - - - sal_uInt32 ObjTextType::GetFont() { return sal_uLong(FontLo)+0x00010000*sal_uLong(FontHi); @@ -1088,9 +1013,7 @@ void ObjTextType::SetFont(sal_uInt32 FontID) } - // SGF.Ini lesen - SgfFontOne::SgfFontOne() { Next=NULL; @@ -1154,8 +1077,6 @@ void SgfFontOne::ReadOne( const OString& rID, OString& Dsc ) } } - - SgfFontLst::SgfFontLst() { pList=NULL; diff --git a/vcl/source/filter/wmf/emfwr.hxx b/vcl/source/filter/wmf/emfwr.hxx index 0ff838416a08..2bf365843de5 100644 --- a/vcl/source/filter/wmf/emfwr.hxx +++ b/vcl/source/filter/wmf/emfwr.hxx @@ -26,10 +26,6 @@ #include <vcl/virdev.hxx> #include <vcl/fltcall.hxx> - -// - EMFWriter - - - class LineInfo; namespace basegfx { class B2DPolygon; } diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx index 47915a01e883..09788f0430a1 100644 --- a/vcl/source/filter/wmf/enhwmf.cxx +++ b/vcl/source/filter/wmf/enhwmf.cxx @@ -179,9 +179,10 @@ struct BLENDFUNCTION{ SvStream& operator>>( SvStream& rIn, BLENDFUNCTION& rBlendFun ) { - rIn.ReadUChar( rBlendFun.aBlendOperation ).ReadUChar( rBlendFun.aBlendFlags ). ReadUChar( rBlendFun.aSrcConstantAlpha ).ReadUChar( rBlendFun.aAlphaFormat ); + rIn.ReadUChar( rBlendFun.aBlendOperation ).ReadUChar( rBlendFun.aBlendFlags ).ReadUChar( rBlendFun.aSrcConstantAlpha ).ReadUChar( rBlendFun.aAlphaFormat ); return rIn; } + SvStream& operator>>( SvStream& rIn, XForm& rXForm ) { if ( sizeof( float ) != 4 ) diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx index adc76649eecf..aca9822e685f 100644 --- a/vcl/source/filter/wmf/winmtf.cxx +++ b/vcl/source/filter/wmf/winmtf.cxx @@ -263,7 +263,6 @@ WinMtfFontStyle::WinMtfFontStyle( LOGFONTW& rFont ) aFont.SetSize( aFontSize ); }; - WinMtf::WinMtf( WinMtfOutput* pWinMtfOutput, SvStream& rStreamWMF, FilterConfigItem* pConfigItem ) : pOut ( pWinMtfOutput ), pWMF ( &rStreamWMF ), @@ -287,7 +286,6 @@ WinMtf::WinMtf( WinMtfOutput* pWinMtfOutput, SvStream& rStreamWMF, FilterConfigI } } - WinMtf::~WinMtf() { delete pOut; @@ -296,14 +294,12 @@ WinMtf::~WinMtf() xStatusIndicator->end(); } - void WinMtf::Callback( sal_uInt16 nPercent ) { if ( xStatusIndicator.is() ) xStatusIndicator->setValue( nPercent ); } - Color WinMtf::ReadColor() { sal_uInt32 nColor; @@ -311,7 +307,6 @@ Color WinMtf::ReadColor() return Color( (sal_uInt8)nColor, (sal_uInt8)( nColor >> 8 ), (sal_uInt8)( nColor >> 16 ) ); }; - Point WinMtfOutput::ImplScale( const Point& rPt) // Hack to set varying defaults for incompletely defined files. { if (mbIsMapDevSet && mbIsMapWinSet) @@ -324,7 +319,6 @@ Point WinMtfOutput::ImplScale( const Point& rPt) // Hack to set varying defaults } } - Point WinMtfOutput::ImplMap( const Point& rPt ) { if ( mnWinExtX && mnWinExtY ) @@ -700,8 +694,6 @@ void WinMtfOutput::ImplDrawClippedPolyPolygon( const PolyPolygon& rPolyPoly ) } } - - void WinMtfOutput::CreateObject( GDIObjectType eType, void* pStyle ) { if ( pStyle ) @@ -730,7 +722,6 @@ void WinMtfOutput::CreateObject( GDIObjectType eType, void* pStyle ) vGDIObj[ nIndex ] = new GDIObj( eType, pStyle ); } - void WinMtfOutput::CreateObject( sal_Int32 nIndex, GDIObjectType eType, void* pStyle ) { if ( ( nIndex & ENHMETA_STOCK_OBJECT ) == 0 ) @@ -775,7 +766,6 @@ void WinMtfOutput::CreateObject( sal_Int32 nIndex, GDIObjectType eType, void* pS } } - void WinMtfOutput::DeleteObject( sal_Int32 nIndex ) { if ( ( nIndex & ENHMETA_STOCK_OBJECT ) == 0 ) @@ -788,7 +778,6 @@ void WinMtfOutput::DeleteObject( sal_Int32 nIndex ) } } - void WinMtfOutput::IntersectClipRect( const Rectangle& rRect ) { mbClipNeedsUpdate=true; @@ -799,14 +788,12 @@ void WinMtfOutput::IntersectClipRect( const Rectangle& rRect ) aClipPath.intersectClipRect( ImplMap( rRect ) ); } - void WinMtfOutput::ExcludeClipRect( const Rectangle& rRect ) { mbClipNeedsUpdate=true; aClipPath.excludeClipRect( ImplMap( rRect ) ); } - void WinMtfOutput::MoveClipRegion( const Size& rSize ) { mbClipNeedsUpdate=true; @@ -879,7 +866,6 @@ WinMtfOutput::WinMtfOutput( GDIMetaFile& rGDIMetaFile ) : SetRasterOp( R2_BLACK ); }; - WinMtfOutput::~WinMtfOutput() { mpGDIMetaFile->AddAction( new MetaPopAction() ); @@ -893,7 +879,6 @@ WinMtfOutput::~WinMtfOutput() delete vGDIObj[ i ]; }; - void WinMtfOutput::UpdateClipRegion() { if ( mbClipNeedsUpdate ) @@ -919,7 +904,6 @@ void WinMtfOutput::UpdateClipRegion() } } - void WinMtfOutput::ImplSetNonPersistentLineColorTransparenz() { Color aColor( COL_TRANSPARENT); @@ -931,7 +915,6 @@ void WinMtfOutput::ImplSetNonPersistentLineColorTransparenz() } } - void WinMtfOutput::UpdateLineStyle() { if (!( maLatestLineStyle == maLineStyle ) ) @@ -941,7 +924,6 @@ void WinMtfOutput::UpdateLineStyle() } } - void WinMtfOutput::UpdateFillStyle() { if ( !mbFillStyleSelected ) // SJ: #i57205# taking care of bkcolor if no brush is selected @@ -954,7 +936,6 @@ void WinMtfOutput::UpdateFillStyle() } } - sal_uInt32 WinMtfOutput::SetRasterOp( sal_uInt32 nRasterOp ) { sal_uInt32 nRetROP = mnRop; @@ -1004,7 +985,6 @@ sal_uInt32 WinMtfOutput::SetRasterOp( sal_uInt32 nRasterOp ) return nRetROP; }; - void WinMtfOutput::StrokeAndFillPath( bool bStroke, bool bFill ) { if ( aPathObj.Count() ) @@ -1037,13 +1017,11 @@ void WinMtfOutput::StrokeAndFillPath( bool bStroke, bool bFill ) } } - void WinMtfOutput::DrawPixel( const Point& rSource, const Color& rColor ) { mpGDIMetaFile->AddAction( new MetaPixelAction( ImplMap( rSource), rColor ) ); } - void WinMtfOutput::MoveTo( const Point& rPoint, bool bRecordPath ) { Point aDest( ImplMap( rPoint ) ); @@ -1058,7 +1036,6 @@ void WinMtfOutput::MoveTo( const Point& rPoint, bool bRecordPath ) maActPos = aDest; } - void WinMtfOutput::LineTo( const Point& rPoint, bool bRecordPath ) { UpdateClipRegion(); @@ -1073,7 +1050,6 @@ void WinMtfOutput::LineTo( const Point& rPoint, bool bRecordPath ) maActPos = aDest; } - void WinMtfOutput::DrawRect( const Rectangle& rRect, bool bEdge ) { UpdateClipRegion(); @@ -1112,7 +1088,6 @@ void WinMtfOutput::DrawRect( const Rectangle& rRect, bool bEdge ) } } - void WinMtfOutput::DrawRoundRect( const Rectangle& rRect, const Size& rSize ) { UpdateClipRegion(); @@ -1121,7 +1096,6 @@ void WinMtfOutput::DrawRoundRect( const Rectangle& rRect, const Size& rSize ) mpGDIMetaFile->AddAction( new MetaRoundRectAction( ImplMap( rRect ), labs( ImplMap( rSize ).Width() ), labs( ImplMap( rSize ).Height() ) ) ); } - void WinMtfOutput::DrawEllipse( const Rectangle& rRect ) { UpdateClipRegion(); @@ -1144,7 +1118,6 @@ void WinMtfOutput::DrawEllipse( const Rectangle& rRect ) } } - void WinMtfOutput::DrawArc( const Rectangle& rRect, const Point& rStart, const Point& rEnd, bool bTo ) { UpdateClipRegion(); @@ -1174,7 +1147,6 @@ void WinMtfOutput::DrawArc( const Rectangle& rRect, const Point& rStart, const P maActPos = aEnd; } - void WinMtfOutput::DrawPie( const Rectangle& rRect, const Point& rStart, const Point& rEnd ) { UpdateClipRegion(); @@ -1198,7 +1170,6 @@ void WinMtfOutput::DrawPie( const Rectangle& rRect, const Point& rStart, const P } } - void WinMtfOutput::DrawChord( const Rectangle& rRect, const Point& rStart, const Point& rEnd ) { UpdateClipRegion(); @@ -1222,7 +1193,6 @@ void WinMtfOutput::DrawChord( const Rectangle& rRect, const Point& rStart, const } } - void WinMtfOutput::DrawPolygon( Polygon& rPolygon, bool bRecordPath ) { UpdateClipRegion(); @@ -1295,7 +1265,6 @@ void WinMtfOutput::DrawPolygon( Polygon& rPolygon, bool bRecordPath ) } } - void WinMtfOutput::DrawPolyPolygon( PolyPolygon& rPolyPolygon, bool bRecordPath ) { UpdateClipRegion(); @@ -1322,7 +1291,6 @@ void WinMtfOutput::DrawPolyPolygon( PolyPolygon& rPolyPolygon, bool bRecordPath } } - void WinMtfOutput::DrawPolyLine( Polygon& rPolygon, bool bTo, bool bRecordPath ) { UpdateClipRegion(); @@ -1342,7 +1310,6 @@ void WinMtfOutput::DrawPolyLine( Polygon& rPolygon, bool bTo, bool bRecordPath ) } } - void WinMtfOutput::DrawPolyBezier( Polygon& rPolygon, bool bTo, bool bRecordPath ) { UpdateClipRegion(); @@ -1373,7 +1340,6 @@ void WinMtfOutput::DrawPolyBezier( Polygon& rPolygon, bool bTo, bool bRecordPath } } - void WinMtfOutput::DrawText( Point& rPosition, OUString& rText, sal_Int32* pDXArry, bool bRecordPath, sal_Int32 nGfxMode ) { UpdateClipRegion(); @@ -1542,7 +1508,6 @@ void WinMtfOutput::DrawText( Point& rPosition, OUString& rText, sal_Int32* pDXAr SetGfxMode( nOldGfxMode ); } - void WinMtfOutput::ImplDrawBitmap( const Point& rPos, const Size& rSize, const BitmapEx rBitmap ) { BitmapEx aBmpEx( rBitmap ); @@ -1586,8 +1551,6 @@ void WinMtfOutput::ImplDrawBitmap( const Point& rPos, const Size& rSize, const B mpGDIMetaFile->AddAction( new MetaBmpScaleAction( rPos, rSize, aBmpEx.GetBitmap() ) ); } - - void WinMtfOutput::ResolveBitmapActions( BSaveStructList_impl& rSaveList ) { UpdateClipRegion(); @@ -1812,24 +1775,18 @@ void WinMtfOutput::ResolveBitmapActions( BSaveStructList_impl& rSaveList ) rSaveList.clear(); } - - void WinMtfOutput::SetDevOrg( const Point& rPoint ) { mnDevOrgX = rPoint.X(); mnDevOrgY = rPoint.Y(); } - - void WinMtfOutput::SetDevOrgOffset( sal_Int32 nXAdd, sal_Int32 nYAdd ) { mnDevOrgX += nXAdd; mnDevOrgY += nYAdd; } - - void WinMtfOutput::SetDevExt( const Size& rSize ,bool regular) { if ( rSize.Width() && rSize.Height() ) @@ -1850,16 +1807,12 @@ void WinMtfOutput::SetDevExt( const Size& rSize ,bool regular) } } - - void WinMtfOutput::ScaleDevExt( double fX, double fY ) { mnDevWidth = FRound( mnDevWidth * fX ); mnDevHeight = FRound( mnDevHeight * fY ); } - - void WinMtfOutput::SetWinOrg( const Point& rPoint , bool bIsEMF) { mnWinOrgX = rPoint.X(); @@ -1871,16 +1824,12 @@ void WinMtfOutput::SetWinOrg( const Point& rPoint , bool bIsEMF) mbIsMapWinSet=true; } - - void WinMtfOutput::SetWinOrgOffset( sal_Int32 nXAdd, sal_Int32 nYAdd ) { mnWinOrgX += nXAdd; mnWinOrgY += nYAdd; } - - void WinMtfOutput::SetDevByWin() //mnWinExt...-stuff has to be assigned before. { if (!mbIsMapDevSet) @@ -1892,8 +1841,6 @@ void WinMtfOutput::SetDevByWin() //mnWinExt...-stuff has to be assigned before. } } - - void WinMtfOutput::SetWinExt( const Size& rSize, bool bIsEMF ) { if( rSize.Width() && rSize.Height() ) @@ -1915,46 +1862,34 @@ void WinMtfOutput::SetWinExt( const Size& rSize, bool bIsEMF ) } } - - void WinMtfOutput::ScaleWinExt( double fX, double fY ) { mnWinExtX = FRound( mnWinExtX * fX ); mnWinExtY = FRound( mnWinExtY * fY ); } - - void WinMtfOutput::SetrclBounds( const Rectangle& rRect ) { mrclBounds = rRect; } - - void WinMtfOutput::SetrclFrame( const Rectangle& rRect ) { mrclFrame = rRect; } - - void WinMtfOutput::SetRefPix( const Size& rSize ) { mnPixX = rSize.Width(); mnPixY = rSize.Height(); } - - void WinMtfOutput::SetRefMill( const Size& rSize ) { mnMillX = rSize.Width(); mnMillY = rSize.Height(); } - - void WinMtfOutput::SetMapMode( sal_uInt32 nMapMode ) { mnMapMode = nMapMode; @@ -1970,8 +1905,6 @@ void WinMtfOutput::SetMapMode( sal_uInt32 nMapMode ) } } - - void WinMtfOutput::SetWorldTransform( const XForm& rXForm ) { maXForm.eM11 = rXForm.eM11; @@ -1982,8 +1915,6 @@ void WinMtfOutput::SetWorldTransform( const XForm& rXForm ) maXForm.eDy = rXForm.eDy; } - - void WinMtfOutput::ModifyWorldTransform( const XForm& rXForm, sal_uInt32 nMode ) { switch( nMode ) @@ -2060,9 +1991,7 @@ void WinMtfOutput::ModifyWorldTransform( const XForm& rXForm, sal_uInt32 nMode ) break; } } - } - - +} void WinMtfOutput::Push() // !! to be able to access the original ClipRegion it { // is not allowed to use the MetaPushAction() @@ -2101,8 +2030,6 @@ void WinMtfOutput::Push() // !! to be able to access the o vSaveStack.push_back( pSave ); } - - void WinMtfOutput::Pop() { // Get the latest data from the stack diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index 055b6999ed18..b2b19df25374 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -394,8 +394,6 @@ struct WinMtfFillStyle } }; - - struct WinMtfLineStyle { Color aLineColor; @@ -446,8 +444,6 @@ struct WinMtfLineStyle } }; - - struct XForm { float eM11; @@ -463,8 +459,6 @@ struct XForm } }; - - struct SaveStruct { sal_uInt32 nBkMode, nMapMode, nGfxMode, nTextLayoutMode; @@ -491,8 +485,6 @@ struct SaveStruct typedef ::boost::shared_ptr< SaveStruct > SaveStructPtr; - - struct BSaveStruct { Bitmap aBmp; @@ -515,8 +507,6 @@ struct BSaveStruct typedef ::std::vector< BSaveStruct* > BSaveStructList_impl; - - enum GDIObjectType { GDI_DUMMY = 0, GDI_PEN = 1, @@ -570,8 +560,6 @@ struct GDIObj } }; - - class WinMtfOutput { WinMtfPathObj aPathObj; @@ -758,8 +746,6 @@ public: virtual ~WinMtfOutput(); }; - - class WinMtf { protected: @@ -787,7 +773,6 @@ protected: ~WinMtf(); }; -//============================ EMFReader ================================== class EnhWMFReader : public WinMtf { @@ -823,7 +808,6 @@ private: template <class T, class Drawer> void ReadAndDrawPolygon(Drawer drawer, const bool skipFirst); }; -//============================ WMFReader ================================== class WMFReader : public WinMtf { diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx index cf84822fc56f..644cb4ee7372 100644 --- a/vcl/source/filter/wmf/winwmf.cxx +++ b/vcl/source/filter/wmf/winwmf.cxx @@ -28,7 +28,7 @@ #include <vcl/svapp.hxx> #include <vcl/dibtools.hxx> -//====================== MS-Windows-defines =============================== +// MS Windows defines #define W_META_SETBKCOLOR 0x0201 #define W_META_SETBKMODE 0x0102 @@ -130,8 +130,6 @@ static void GetWinExtMax( const Rectangle& rSource, Rectangle& rPlaceableBound, GetWinExtMax( rSource.BottomRight(), rPlaceableBound, nMapMode ); } -//=================== Methods of WMFReader ============================== - inline Point WMFReader::ReadPoint() { short nX = 0, nY = 0; @@ -139,8 +137,6 @@ inline Point WMFReader::ReadPoint() return Point( nX, nY ); } - - inline Point WMFReader::ReadYX() { short nX = 0, nY = 0; @@ -148,8 +144,6 @@ inline Point WMFReader::ReadYX() return Point( nX, nY ); } - - Rectangle WMFReader::ReadRectangle() { Point aBR, aTL; @@ -160,8 +154,6 @@ Rectangle WMFReader::ReadRectangle() return Rectangle( aTL, aBR ); } - - Size WMFReader::ReadYXExt() { short nW=0, nH=0; @@ -169,8 +161,6 @@ Size WMFReader::ReadYXExt() return Size( nW, nH ); } - - void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) { switch( nFunc ) @@ -1089,8 +1079,6 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) } } - - bool WMFReader::ReadHeader() { sal_Size nStrmPos = pWMF->Tell(); @@ -1304,8 +1292,6 @@ void WMFReader::ReadWMF() pWMF->Seek( nStartPos ); } - - bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pStm ) { bool bRet = true; diff --git a/vcl/source/filter/wmf/wmf.cxx b/vcl/source/filter/wmf/wmf.cxx index 2100052336ab..59e26b44a853 100644 --- a/vcl/source/filter/wmf/wmf.cxx +++ b/vcl/source/filter/wmf/wmf.cxx @@ -25,8 +25,6 @@ #include <vcl/gdimetafiletools.hxx> #include <comphelper/scopeguard.hxx> - - bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem, WMF_EXTERNALHEADER *pExtHeader ) { sal_uInt32 nMetaType; @@ -56,8 +54,6 @@ bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, return !rStreamWMF.GetError(); } - - bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* pFilterConfigItem ) { sal_uInt32 nMetaType(0); @@ -90,8 +86,6 @@ bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* return rStream.good(); } - - bool ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, SvStream & rTargetStream, FilterConfigItem* pConfigItem, bool bPlaceable) { @@ -109,8 +103,6 @@ bool ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, SvStream & rTargetStream return aWMFWriter.WriteWMF( aGdiMetaFile, rTargetStream, pConfigItem, bPlaceable ); } - - bool ConvertGDIMetaFileToEMF( const GDIMetaFile & rMTF, SvStream & rTargetStream, FilterConfigItem* pConfigItem ) { @@ -128,8 +120,6 @@ bool ConvertGDIMetaFileToEMF( const GDIMetaFile & rMTF, SvStream & rTargetStream return aEMFWriter.WriteEMF( aGdiMetaFile, pConfigItem ); } - - bool WriteWindowMetafileBits( SvStream& rStream, const GDIMetaFile& rMTF ) { return WMFWriter().WriteWMF( rMTF, rStream, NULL, false ); diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx index ac979a20a6ef..16da0bcad004 100644 --- a/vcl/source/filter/wmf/wmfwr.cxx +++ b/vcl/source/filter/wmf/wmfwr.cxx @@ -35,7 +35,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> -//====================== MS-Windows-defines =============================== +// MS Windows defines #define W_META_SETBKMODE 0x0102 #define W_META_SETROP2 0x0104 @@ -130,8 +130,6 @@ #define PRIVATE_ESCAPE_UNICODE 2 -//========================== methods of WMFWriter ========================== - void WMFWriter::MayCallback() { if ( xStatusIndicator.is() ) @@ -285,7 +283,6 @@ void WMFWriter::WMFRecord_CreateBrushIndirect(const Color& rColor) pWMF->WriteUInt16( (sal_uInt16) 0 ); } - void WMFWriter::WMFRecord_CreateFontIndirect(const Font & rFont) { sal_uInt16 nWeight,i; @@ -578,14 +575,12 @@ void WMFWriter::WMFRecord_LineTo(const Point & rPoint) WritePointYX(rPoint); } - void WMFWriter::WMFRecord_MoveTo(const Point & rPoint) { WriteRecordHeader(0x00000005,W_META_MOVETO); WritePointYX(rPoint); } - void WMFWriter::WMFRecord_Pie(const Rectangle & rRect, const Point & rStartPt, const Point & rEndPt) { WriteRecordHeader(0x0000000b,W_META_PIE); @@ -594,7 +589,6 @@ void WMFWriter::WMFRecord_Pie(const Rectangle & rRect, const Point & rStartPt, c WriteRectangle(rRect); } - void WMFWriter::WMFRecord_Polygon(const Polygon & rPoly) { sal_uInt16 nSize,i; @@ -610,7 +604,6 @@ void WMFWriter::WMFRecord_Polygon(const Polygon & rPoly) for (i=0; i<nSize; i++) WritePointXY(aSimplePoly.GetPoint(i)); } - void WMFWriter::WMFRecord_PolyLine(const Polygon & rPoly) { sal_uInt16 nSize,i; @@ -709,7 +702,6 @@ void WMFWriter::WMFRecord_SetPixel(const Point & rPoint, const Color & rColor) WritePointYX(rPoint); } - void WMFWriter::WMFRecord_SetROP2(RasterOp eROP) { sal_uInt16 nROP2; @@ -723,7 +715,6 @@ void WMFWriter::WMFRecord_SetROP2(RasterOp eROP) pWMF->WriteUInt16( nROP2 ); } - void WMFWriter::WMFRecord_SetTextAlign(FontAlign eFontAlign, sal_uInt32 eHorTextAlign) { sal_uInt16 nAlign; @@ -740,14 +731,12 @@ void WMFWriter::WMFRecord_SetTextAlign(FontAlign eFontAlign, sal_uInt32 eHorText pWMF->WriteUInt16( nAlign ); } - void WMFWriter::WMFRecord_SetTextColor(const Color & rColor) { WriteRecordHeader(0x00000005,W_META_SETTEXTCOLOR); WriteColor(rColor); } - void WMFWriter::WMFRecord_SetWindowExt(const Size & rSize) { WriteRecordHeader(0x00000005,W_META_SETWINDOWEXT); @@ -761,7 +750,6 @@ void WMFWriter::WMFRecord_SetWindowOrg(const Point & rPoint) WritePointYX(rPoint); } - void WMFWriter::WMFRecord_StretchDIB( const Point & rPoint, const Size & rSize, const Bitmap & rBitmap, sal_uInt32 nROP ) { @@ -813,7 +801,6 @@ void WMFWriter::WMFRecord_StretchDIB( const Point & rPoint, const Size & rSize, nActBitmapPercent=0; } - void WMFWriter::WMFRecord_TextOut(const Point & rPoint, const OUString & rStr) { rtl_TextEncoding eChrSet = aSrcFont.GetCharSet(); @@ -1651,8 +1638,6 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF ) } } - - void WMFWriter::WriteHeader( const GDIMetaFile &, bool bPlaceable ) { if( bPlaceable ) @@ -1686,7 +1671,6 @@ void WMFWriter::WriteHeader( const GDIMetaFile &, bool bPlaceable ) } - void WMFWriter::UpdateHeader() { sal_uLong nPos; @@ -1708,7 +1692,6 @@ void WMFWriter::UpdateHeader() } - bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream, FilterConfigItem* pFConfigItem, bool bPlaceable ) { @@ -1834,7 +1817,6 @@ bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream, } - sal_uInt16 WMFWriter::CalcSaveTargetMapMode(MapMode& rMapMode, const Size& rPrefSize) { @@ -1859,8 +1841,6 @@ sal_uInt16 WMFWriter::CalcSaveTargetMapMode(MapMode& rMapMode, return nDivisor; } - - void WMFWriter::WriteEmbeddedEMF( const GDIMetaFile& rMTF ) { SvMemoryStream aStream; @@ -1912,8 +1892,6 @@ void WMFWriter::WriteEmbeddedEMF( const GDIMetaFile& rMTF ) } } - - void WMFWriter::WriteEMFRecord( SvMemoryStream& rStream, sal_uInt32 nCurSize, sal_uInt32 nRemainingSize, sal_uInt32 nTotalSize, sal_uInt32 nRecCounts, sal_uInt16 nCheckSum ) { diff --git a/vcl/source/filter/wmf/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx index 4322a764fe07..293bed2d47aa 100644 --- a/vcl/source/filter/wmf/wmfwr.hxx +++ b/vcl/source/filter/wmf/wmfwr.hxx @@ -26,12 +26,8 @@ #include <vcl/virdev.hxx> #include <vcl/fltcall.hxx> - - #define MAXOBJECTHANDLES 16 - - struct WMFWriterAttrStackMember { struct WMFWriterAttrStackMember * pSucc; @@ -47,10 +43,6 @@ struct WMFWriterAttrStackMember sal_uInt16 nFlags; }; - -// - WMFWriter - - - class StarSymbolToMSMultiFont; class LineInfo; namespace basegfx { class B2DPolygon; } diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index b1411ac27e7d..bfcf0780d51c 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -39,8 +39,6 @@ typedef RealType ValType; #include <vector> typedef std::vector<ValType> ValVector; - - static const char* pStringIds[] = { /*0*/ ".notdef", "space", "exclam", "quotedbl", "numbersign", "dollar", "percent", "ampersand", @@ -142,10 +140,6 @@ static const char* pStringIds[] = { "Regular", "Roman", "Semibold" }; - - - - // TOP DICT keywords (also covers PRIV DICT keywords) static const char* pDictOps[] = { "sVersion", "sNotice", "sFullName", "sFamilyName", @@ -158,8 +152,6 @@ static const char* pDictOps[] = { "shortint", "longint", "BCD", NULL }; - - // TOP DICT escapes (also covers PRIV DICT escapes) static const char* pDictEscs[] = { "sCopyright", "bIsFixedPitch", "nItalicAngle", "nUnderlinePosition", @@ -174,8 +166,6 @@ static const char* pDictEscs[] = { "nFDArray", "nFDSelect", "sFontName" }; - - static const char* pType1Ops[] = { NULL, "2hstem", NULL, "2vstem", "1vmoveto", "Arlineto", "1hlineto", "1vlineto", @@ -187,8 +177,6 @@ static const char* pType1Ops[] = { NULL, NULL, "4vhcurveto", "4hvcurveto" }; - - static const char* pT1EscOps[] = { "0dotsection", "6vstem3", "6hstem3", NULL, NULL, NULL, "5seac", "4sbw", @@ -201,8 +189,6 @@ static const char* pT1EscOps[] = { NULL, "2setcurrentpoint" }; - - struct TYPE1OP { enum OPS @@ -222,8 +208,6 @@ struct TYPE1OP }; }; - - static const char* pType2Ops[] = { NULL, "hhstem", NULL, "vvstem", "mvmoveto", "Arlineto", "Ehlineto", "Evlineto", @@ -235,8 +219,6 @@ static const char* pType2Ops[] = { ".shortint", "Gcallgsubr", ".vhcurveto", ".hvcurveto" }; - - static const char* pT2EscOps[] = { NULL, NULL, NULL, "2and", "2or", "1not", NULL, NULL, @@ -250,8 +232,6 @@ static const char* pT2EscOps[] = { "9hflex1", "fflex1" }; - - struct TYPE2OP { enum OPS @@ -276,8 +256,6 @@ struct TYPE2OP }; }; - - struct CffGlobal { explicit CffGlobal(); @@ -306,8 +284,6 @@ struct CffGlobal int mnFamilyNameSID; }; - - struct CffLocal { explicit CffLocal(); @@ -339,8 +315,6 @@ struct CffLocal bool mbForceBold; }; - - class SubsetterContext { public: @@ -355,8 +329,6 @@ public: SubsetterContext::~SubsetterContext( void) {} - - class CffSubsetterContext : public SubsetterContext , private CffGlobal @@ -568,8 +540,6 @@ void CffSubsetterContext::addHints( bool bVerticalHints) mnStackIdx = 0; } - - void CffSubsetterContext::setCharStringType( int nVal) { switch( nVal) { @@ -579,8 +549,6 @@ void CffSubsetterContext::setCharStringType( int nVal) } } - - void CffSubsetterContext::readDictOp( void) { ValType nVal = 0; @@ -718,8 +686,6 @@ void CffSubsetterContext::readDictOp( void) } } - - void CffSubsetterContext::read2push() { ValType aVal = 0; @@ -752,8 +718,6 @@ void CffSubsetterContext::read2push() push( aVal); } - - void CffSubsetterContext::writeType1Val( ValType aVal) { U8* pOut = mpWritePtr; @@ -789,31 +753,23 @@ void CffSubsetterContext::writeType1Val( ValType aVal) mpWritePtr = pOut; } - - inline void CffSubsetterContext::pop2write( void) { const ValType aVal = popVal(); writeType1Val( aVal); } - - inline void CffSubsetterContext::writeTypeOp( int nTypeOp) { *(mpWritePtr++) = static_cast<U8>(nTypeOp); } - - inline void CffSubsetterContext::writeTypeEsc( int nTypeEsc) { *(mpWritePtr++) = TYPE1OP::T1ESC; *(mpWritePtr++) = static_cast<U8>(nTypeEsc); } - - void CffSubsetterContext::pop2MultiWrite( int nArgsPerTypo, int nTypeOp, int nTypeXor) { for( int i = 0; i < mnStackIdx;) { @@ -828,8 +784,6 @@ void CffSubsetterContext::pop2MultiWrite( int nArgsPerTypo, int nTypeOp, int nTy clear(); } - - void CffSubsetterContext::popAll2Write( int nTypeOp) { // pop in reverse order, then write @@ -841,8 +795,6 @@ void CffSubsetterContext::popAll2Write( int nTypeOp) writeTypeOp( nTypeOp); } - - void CffSubsetterContext::writeCurveTo( int nStackPos, int nIX1, int nIY1, int nIX2, int nIY2, int nIX3, int nIY3) { @@ -866,8 +818,6 @@ void CffSubsetterContext::writeCurveTo( int nStackPos, writeTypeOp( TYPE1OP::RCURVETO ); } - - void CffSubsetterContext::convertOneTypeOp( void) { const int nType2Op = *(mpReadPtr++); @@ -1093,8 +1043,6 @@ void CffSubsetterContext::convertOneTypeOp( void) } } - - void CffSubsetterContext::convertOneTypeEsc( void) { const int nType2Esc = *(mpReadPtr++); @@ -1276,8 +1224,6 @@ void CffSubsetterContext::convertOneTypeEsc( void) } } - - void CffSubsetterContext::callType2Subr( bool bGlobal, int nSubrNumber) { const U8* const pOldReadPtr = mpReadPtr; @@ -1298,8 +1244,6 @@ void CffSubsetterContext::callType2Subr( bool bGlobal, int nSubrNumber) mpReadEnd = pOldReadEnd; } - - static const int MAX_T1OPS_SIZE = 81920; // TODO: use dynamic value int CffSubsetterContext::convert2Type1Ops( CffLocal* pCffLocal, const U8* const pT2Ops, int nT2Len, U8* const pT1Ops) @@ -1375,8 +1319,6 @@ if( mbSawError) { return nType1Len; } - - RealType CffSubsetterContext::readRealVal() { // TODO: more thorough number validity test @@ -1447,8 +1389,6 @@ RealType CffSubsetterContext::readRealVal() return fReal; } - - // prepare to access an element inside a CFF/CID index table int CffSubsetterContext::seekIndexData( int nIndexBase, int nDataIndex) { @@ -1488,8 +1428,6 @@ int CffSubsetterContext::seekIndexData( int nIndexBase, int nDataIndex) return (nOfs2 - nOfs1); } - - // skip over a CFF/CID index table void CffSubsetterContext::seekIndexEnd( int nIndexBase) { @@ -1514,8 +1452,6 @@ void CffSubsetterContext::seekIndexEnd( int nIndexBase) assert( mpReadEnd <= mpBaseEnd); } - - // initialize FONTDICT specific values CffLocal::CffLocal( void) : mnPrivDictBase( 0) @@ -1543,8 +1479,6 @@ CffLocal::CffLocal( void) maFamilyOtherBlues.clear(); } - - CffGlobal::CffGlobal( void) : mnNameIdxBase( 0) , mnNameIdxCount( 0) @@ -1569,8 +1503,6 @@ CffGlobal::CffGlobal( void) // TODO; maFontMatrix.clear(); } - - void CffSubsetterContext::initialCffRead( void) { // get the CFFHeader @@ -1672,8 +1604,6 @@ void CffSubsetterContext::initialCffRead( void) // ignore the Notices info } - - // get a cstring from a StringID const char* CffSubsetterContext::getString( int nStringID) { @@ -1706,8 +1636,6 @@ const char* CffSubsetterContext::getString( int nStringID) return aNameBuf; } - - // access a CID's FDSelect table int CffSubsetterContext::getFDSelect( int nGlyphIndex) const { @@ -1752,8 +1680,6 @@ int CffSubsetterContext::getFDSelect( int nGlyphIndex) const return -1; } - - int CffSubsetterContext::getGlyphSID( int nGlyphIndex) const { if( nGlyphIndex == 0) @@ -1801,8 +1727,6 @@ int CffSubsetterContext::getGlyphSID( int nGlyphIndex) const return nSID; } - - // NOTE: the result becomes invalid with the next call to this method const char* CffSubsetterContext::getGlyphName( int nGlyphIndex) { @@ -1839,8 +1763,6 @@ const char* CffSubsetterContext::getGlyphName( int nGlyphIndex) return pGlyphName; } - - class Type1Emitter { public: @@ -1868,8 +1790,6 @@ public: int mnHexLineCol; }; - - Type1Emitter::Type1Emitter( FILE* pOutFile, bool bPfbSubset) : mpFileOut( pOutFile) , mbCloseOutfile( false) @@ -1881,8 +1801,6 @@ Type1Emitter::Type1Emitter( FILE* pOutFile, bool bPfbSubset) maSubsetName[0] = '\0'; } - - Type1Emitter::~Type1Emitter( void) { if( !mpFileOut) @@ -1892,8 +1810,6 @@ Type1Emitter::~Type1Emitter( void) mpFileOut = NULL; } - - void Type1Emitter::setSubsetName( const char* pSubsetName) { maSubsetName[0] = '\0'; @@ -1902,16 +1818,12 @@ void Type1Emitter::setSubsetName( const char* pSubsetName) maSubsetName[sizeof(maSubsetName)-1] = '\0'; } - - int Type1Emitter::tellPos( void) const { int nTellPos = ftell( mpFileOut); return nTellPos; } - - size_t Type1Emitter::updateLen( int nTellPos, size_t nLength) { // update PFB segment header length @@ -1928,15 +1840,11 @@ size_t Type1Emitter::updateLen( int nTellPos, size_t nLength) return nWrote; } - - inline size_t Type1Emitter::emitRawData(const char* pData, size_t nLength) const { return fwrite( pData, 1, nLength, mpFileOut); } - - inline void Type1Emitter::emitAllRaw( void) { // writeout raw data @@ -1946,8 +1854,6 @@ inline void Type1Emitter::emitAllRaw( void) mpPtr = maBuffer; } - - inline void Type1Emitter::emitAllHex( void) { assert( (mpPtr - maBuffer) < (int)sizeof(maBuffer)); @@ -1974,8 +1880,6 @@ inline void Type1Emitter::emitAllHex( void) mpPtr = maBuffer; } - - void Type1Emitter::emitAllCrypted( void) { // apply t1crypt @@ -1991,8 +1895,6 @@ void Type1Emitter::emitAllCrypted( void) emitAllHex(); } - - // #i110387# quick-and-dirty double->ascii conversion // needed because sprintf/ecvt/etc. alone are too localized (LC_NUMERIC) // also strip off trailing zeros in fraction while we are at it @@ -2002,8 +1904,6 @@ inline int dbl2str( char* pOut, double fVal, int nPrecision=6) return nLen; } - - void Type1Emitter::emitValVector( const char* pLineHead, const char* pLineTail, const ValVector& rVector) { @@ -2028,8 +1928,6 @@ void Type1Emitter::emitValVector( const char* pLineHead, const char* pLineTail, mpPtr += sprintf( mpPtr, "%s", pLineTail); } - - bool CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter, const sal_GlyphId* pReqGlyphIds, const U8* pReqEncoding, GlyphWidth* pGlyphWidths, int nGlyphCount, FontSubsetInfo& rFSInfo) @@ -2335,8 +2233,6 @@ bool CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter, return true; } - - bool FontSubsetInfo::CreateFontSubsetFromCff( GlyphWidth* pOutGlyphWidths ) { CffSubsetterContext aCff( mpInFontBytes, mnInByteLength); @@ -2353,6 +2249,4 @@ bool FontSubsetInfo::CreateFontSubsetFromCff( GlyphWidth* pOutGlyphWidths ) return bRC; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/fontsubset/fontsubset.cxx b/vcl/source/fontsubset/fontsubset.cxx index 62d83504a421..0f11ef7d251d 100644 --- a/vcl/source/fontsubset/fontsubset.cxx +++ b/vcl/source/fontsubset/fontsubset.cxx @@ -23,8 +23,6 @@ #include <fontsubset.hxx> #include <sft.hxx> - - FontSubsetInfo::FontSubsetInfo() : m_nAscent( 0) , m_nDescent( 0) @@ -36,13 +34,9 @@ FontSubsetInfo::FontSubsetInfo() , mpSftTTFont( NULL) {} - - FontSubsetInfo::~FontSubsetInfo() {} - - // prepare subsetting for fonts where the input font file is mapped bool FontSubsetInfo::LoadFont( FontSubsetInfo::FontType eInFontType, @@ -55,8 +49,6 @@ bool FontSubsetInfo::LoadFont( return (mnInByteLength > 0); } - - // prepare subsetting for fonts that are known to the SFT-parser bool FontSubsetInfo::LoadFont( vcl::_TrueTypeFont* pSftTTFont ) { @@ -66,8 +58,6 @@ bool FontSubsetInfo::LoadFont( vcl::_TrueTypeFont* pSftTTFont ) return (mpSftTTFont == NULL); } - - bool FontSubsetInfo::CreateFontSubset( int nReqFontTypeMask, FILE* pOutFile, const char* pReqFontName, @@ -113,8 +103,6 @@ bool FontSubsetInfo::CreateFontSubset( return bOK; } - - // TODO: move function to sft.cxx to replace dummy implementation bool FontSubsetInfo::CreateFontSubsetFromSfnt( sal_Int32* pOutGlyphWidths ) { @@ -158,8 +146,6 @@ bool FontSubsetInfo::CreateFontSubsetFromSfnt( sal_Int32* pOutGlyphWidths ) return (nSFTErr != vcl::SF_OK); } - - // TODO: replace dummy implementation bool FontSubsetInfo::CreateFontSubsetFromType1( sal_Int32* pOutGlyphWidths) { @@ -168,6 +154,4 @@ bool FontSubsetInfo::CreateFontSubsetFromType1( sal_Int32* pOutGlyphWidths) return false; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/fontsubset/ttcr.cxx b/vcl/source/fontsubset/ttcr.cxx index d8a97c16b389..3dca37ce8f6e 100644 --- a/vcl/source/fontsubset/ttcr.cxx +++ b/vcl/source/fontsubset/ttcr.cxx @@ -36,7 +36,6 @@ #include "string.h" - namespace vcl { diff --git a/vcl/source/fontsubset/ttcr.hxx b/vcl/source/fontsubset/ttcr.hxx index e95554224935..bb94faae1081 100644 --- a/vcl/source/fontsubset/ttcr.hxx +++ b/vcl/source/fontsubset/ttcr.hxx @@ -57,12 +57,6 @@ namespace vcl TTCR_POSTFORMAT = 6 /**< unsupported format of a 'post' table */ }; -/* ============================================================================ - * - * TrueTypeCreator methods - * - * ============================================================================ */ - /** * TrueTypeCreator constructor. * Allocates all internal structures. @@ -86,7 +80,6 @@ namespace vcl void RemoveTable(TrueTypeCreator *_this, sal_uInt32 tag); - /** * Writes a TrueType font generated by the TrueTypeCreator to a segment of * memory that this method allocates. When it is not needed anymore the caller @@ -102,13 +95,6 @@ namespace vcl int StreamToFile(TrueTypeCreator *_this, const char* fname); -/* ============================================================================ - * - * TrueTypeTable methods - * - * ============================================================================ */ - - /** * This function converts the data of a TrueType table to a raw array of bytes. * It may allocates the memory for it and returns the size of the raw data in bytes. @@ -199,12 +185,7 @@ namespace vcl sal_uInt32 isFixedPitch); -/*------------------------------------------------------------------------------ - * - * Table manipulation functions - * - *------------------------------------------------------------------------------*/ - +// Table manipulation functions /** * Add a character/glyph pair to a cmap table diff --git a/vcl/source/fontsubset/xlat.cxx b/vcl/source/fontsubset/xlat.cxx index 673924f31530..56b4e2432f9e 100644 --- a/vcl/source/fontsubset/xlat.cxx +++ b/vcl/source/fontsubset/xlat.cxx @@ -20,9 +20,7 @@ #include "rtl/textcvt.h" #include <tools/debug.hxx> -namespace { // anonymous namespace - - +namespace { #define MAX_CVT_SELECT 6 @@ -40,8 +38,6 @@ private: rtl_UnicodeToTextContext maContexts[ MAX_CVT_SELECT+1 ]; }; - - ConverterCache::ConverterCache( void) { for( int i = 0; i <= MAX_CVT_SELECT; ++i) @@ -51,8 +47,6 @@ ConverterCache::ConverterCache( void) } } - - ConverterCache::~ConverterCache( void) { for( int i = 0; i <= MAX_CVT_SELECT; ++i) @@ -64,8 +58,6 @@ ConverterCache::~ConverterCache( void) } } - - void ConverterCache::ensureConverter( int nSelect ) { // DBG_ASSERT( (2<=nSelect) && (nSelect<=MAX_CVT_SELECT)), "invalid XLAT.Converter requested" ); @@ -93,8 +85,6 @@ void ConverterCache::ensureConverter( int nSelect ) rtl_resetUnicodeToTextContext( maConverterCache[ nSelect ], aContext ); } - - sal_uInt16 ConverterCache::convertOne( int nSelect, sal_Unicode aChar ) { ensureConverter( nSelect ); @@ -118,8 +108,6 @@ sal_uInt16 ConverterCache::convertOne( int nSelect, sal_Unicode aChar ) return aCode; } - - void ConverterCache::convertStr( int nSelect, const sal_Unicode* pSrc, sal_uInt16* pDst, int nCount ) { ensureConverter( nSelect ); @@ -150,8 +138,6 @@ void ConverterCache::convertStr( int nSelect, const sal_Unicode* pSrc, sal_uInt1 } // anonymous namespace - - #include "xlat.hxx" namespace vcl |