diff options
Diffstat (limited to 'vcl/source')
195 files changed, 0 insertions, 4076 deletions
diff --git a/vcl/source/app/IconThemeScanner.cxx b/vcl/source/app/IconThemeScanner.cxx index 152dbdca4646..9684bb6d7b0a 100644 --- a/vcl/source/app/IconThemeScanner.cxx +++ b/vcl/source/app/IconThemeScanner.cxx @@ -183,7 +183,6 @@ IconThemeScanner::GetIconThemeInfo(const OUString& themeId) return *info; } - } // end namespace vcl /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx index 023745bf9bcd..4f8b4e591791 100644 --- a/vcl/source/app/IconThemeSelector.cxx +++ b/vcl/source/app/IconThemeSelector.cxx @@ -22,7 +22,6 @@ IconThemeSelector::HIGH_CONTRAST_ICON_THEME_ID("hicontrast"); /*static*/ const OUString IconThemeSelector::FALLBACK_ICON_THEME_ID("tango"); - namespace { class SameTheme : diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index 29067fb24a23..ae084a7b0cf4 100644 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -225,7 +225,6 @@ private: void GetAssertionEntryRange( sal_uInt16 nInbetweenEntry, sal_uInt16& nFirst, sal_uInt16& nLast ); }; - class DbgInfoDialog : public ModalDialog { private: @@ -239,7 +238,6 @@ public: void SetInfoText( const OUString& rStr ); }; - class DbgDialog : public ModalDialog { private: diff --git a/vcl/source/app/dndhelp.cxx b/vcl/source/app/dndhelp.cxx index 05c2f9d12562..7b056828893c 100644 --- a/vcl/source/app/dndhelp.cxx +++ b/vcl/source/app/dndhelp.cxx @@ -89,8 +89,6 @@ void vcl::unohelper::DragAndDropClient::dropActionChanged( const ::com::sun::sta { } - - vcl::unohelper::DragAndDropWrapper::DragAndDropWrapper( DragAndDropClient* pClient ) { mpClient = pClient; @@ -119,7 +117,6 @@ void vcl::unohelper::DragAndDropWrapper::disposing( const ::com::sun::star::lang mpClient = NULL; } - // ::com::sun::star::datatransfer::dnd::XDragGestureListener void vcl::unohelper::DragAndDropWrapper::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& rDGE ) throw (::com::sun::star::uno::RuntimeException, std::exception) { diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index 77b655ab65d5..b84364e00b24 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -464,7 +464,6 @@ OUString HelpTextWindow::GetText() const 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 ) diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx index 40585a81ed71..6796e6359a72 100644 --- a/vcl/source/app/i18nhelp.cxx +++ b/vcl/source/app/i18nhelp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "comphelper/processfactory.hxx" #include "unotools/localedatawrapper.hxx" #include "unotools/transliterationwrapper.hxx" @@ -124,7 +123,6 @@ sal_Int32 vcl::I18nHelper::CompareString( const OUString& rStr1, const OUString& ((vcl::I18nHelper*)this)->mpTransliterationWrapper = NULL; } - OUString aStr1( filterFormattingChars(rStr1) ); OUString aStr2( filterFormattingChars(rStr2) ); return ImplGetTransliterationWrapper().compareString( aStr1, aStr2 ); @@ -162,7 +160,6 @@ bool vcl::I18nHelper::MatchMnemonic( const OUString& rString, sal_Unicode cMnemo return bEqual; } - OUString vcl::I18nHelper::GetNum( long nNumber, sal_uInt16 nDecimals, bool bUseThousandSep, bool bTrailingZeros ) const { return ImplGetLocaleDataWrapper().getNum( nNumber, nDecimals, bUseThousandSep, bTrailingZeros ); diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 3c0a0f526eb3..cbde0d4bf038 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <salframe.hxx> #include <salinst.hxx> #include <salvd.hxx> @@ -36,8 +35,6 @@ SalFrame::~SalFrame() { } - - // default to full-frame flushes // on ports where partial-flushes are much cheaper this method should be overridden void SalFrame::Flush( const Rectangle& ) @@ -45,15 +42,11 @@ void SalFrame::Flush( const Rectangle& ) Flush(); } - - void SalFrame::SetRepresentedURL( const OUString& ) { // currently this is Mac only functionality } - - SalInstance::~SalInstance() { } diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx index cf430b4a08ff..ac6e6c4bb810 100644 --- a/vcl/source/app/session.cxx +++ b/vcl/source/app/session.cxx @@ -41,7 +41,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::frame; - SalSession::~SalSession() { } diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index b175108381c0..ad9bfa11f292 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -78,7 +78,6 @@ struct ImplMouseData sal_uInt16 mnWheelBehavior; }; - struct ImplStyleData { ImplStyleData(); @@ -207,7 +206,6 @@ struct ImplStyleData boost::optional<Color> maPersonaMenuBarTextColor; ///< Cache the menubar color. }; - struct ImplMiscData { ImplMiscData(); @@ -217,7 +215,6 @@ struct ImplMiscData TriState mnDisablePrinting; }; - struct ImplHelpData { ImplHelpData(); @@ -430,7 +427,6 @@ MouseSettings::GetMenuDelay() const return mpData->mnMenuDelay; } - void MouseSettings::SetFollow( sal_uLong nFollow ) { @@ -444,7 +440,6 @@ MouseSettings::GetFollow() const return mpData->mnFollow; } - void MouseSettings::SetMiddleButtonAction( sal_uInt16 nAction ) { @@ -482,8 +477,6 @@ MouseSettings::MouseSettings() { } - - MouseSettings::~MouseSettings() { } @@ -1363,7 +1356,6 @@ StyleSettings::GetMonoColor() const return mpData->maMonoColor; } - void StyleSettings::SetActiveTabColor( const Color& rColor ) { @@ -1501,7 +1493,6 @@ StyleSettings::GetPrimaryButtonWarpsSlider() const return mpData->mbPrimaryButtonWarpsSlider; } - void StyleSettings::SetCairoFontOptions( const void *pOptions ) { @@ -1515,7 +1506,6 @@ StyleSettings::GetCairoFontOptions() const return mpData->mpFontOptions; } - void StyleSettings::SetAppFont( const Font& rFont ) { @@ -1794,7 +1784,6 @@ StyleSettings::GetCursorBlinkTime() const return (long) mpData->mnCursorBlinkTime; } - void StyleSettings::SetScreenZoom( sal_uInt16 nPercent ) { @@ -1847,7 +1836,6 @@ StyleSettings::GetSelectionOptions() const return mpData->mnSelectionOptions; } - void StyleSettings::SetDisplayOptions( sal_uLong nOptions ) { @@ -1874,7 +1862,6 @@ StyleSettings::GetAntialiasingMinPixelHeight() const return mpData->mnAntialiasedMin; } - void StyleSettings::SetOptions( sal_uLong nOptions ) { @@ -1895,7 +1882,6 @@ StyleSettings::GetAutoMnemonic() const return mpData->mbAutoMnemonic; } - void StyleSettings::SetFontColor( const Color& rColor ) { @@ -1909,7 +1895,6 @@ StyleSettings::GetFontColor() const return mpData->maFontColor; } - void StyleSettings::SetToolbarIconSize( sal_uLong nSize ) { @@ -1936,7 +1921,6 @@ StyleSettings::SetDialogStyle( const DialogStyle& rStyle ) mpData->maDialogStyle = rStyle; } - const FrameStyle& StyleSettings::GetFrameStyle() const { diff --git a/vcl/source/app/sound.cxx b/vcl/source/app/sound.cxx index 308f37f8c57f..226d09fb345c 100644 --- a/vcl/source/app/sound.cxx +++ b/vcl/source/app/sound.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/sound.hxx> diff --git a/vcl/source/app/stdtext.cxx b/vcl/source/app/stdtext.cxx index 4758a2533189..edd115d0befa 100644 --- a/vcl/source/app/stdtext.cxx +++ b/vcl/source/app/stdtext.cxx @@ -17,14 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/msgbox.hxx> #include <vcl/stdtext.hxx> #include <svids.hrc> #include <svdata.hxx> - OUString GetStandardText( sal_uInt16 nStdText ) { ResMgr* pResMgr = ImplGetResMgr(); diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index 21a3d1a7a4e7..b899ec73816d 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -303,8 +303,6 @@ bool ImplInitAccessBridge() return true; } - - Window* ImplFindWindow( const SalFrame* pFrame, ::Point& rSalFramePos ) { ImplSVData* pSVData = ImplGetSVData(); diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx index 2f4ff80eee25..f83f55ceb14e 100644 --- a/vcl/source/app/timer.cxx +++ b/vcl/source/app/timer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/time.hxx> #include <vcl/svapp.hxx> @@ -27,7 +26,6 @@ #include <svdata.hxx> #include <salinst.hxx> - #define MAX_TIMER_PERIOD ((sal_uLong)0xFFFFFFFF) struct ImplTimerData diff --git a/vcl/source/app/unohelp2.cxx b/vcl/source/app/unohelp2.cxx index ccaa289219c2..7dc274cffb00 100644 --- a/vcl/source/app/unohelp2.cxx +++ b/vcl/source/app/unohelp2.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp> - using namespace ::com::sun::star; namespace vcl { namespace unohelper { diff --git a/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx index 50c6b00c9cdd..8d5b69ae96c3 100644 --- a/vcl/source/app/vclevent.cxx +++ b/vcl/source/app/vclevent.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/vclevent.hxx" #include "svdata.hxx" diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index c584aad08b31..35065ad43975 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "osl/mutex.hxx" #include "vcl/svapp.hxx" @@ -207,8 +206,6 @@ void GenericClipboard::removeClipboardListener( const Reference< datatransfer::c m_aListeners.remove( listener ); } - - class ClipboardFactory : public ::cppu::WeakComponentImplHelper1< com::sun::star::lang::XSingleServiceFactory > @@ -225,8 +222,6 @@ public: virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( const Sequence< Any >& rArgs ) throw(std::exception) SAL_OVERRIDE; }; - - ClipboardFactory::ClipboardFactory() : cppu::WeakComponentImplHelper1< com::sun::star::lang::XSingleServiceFactory @@ -234,21 +229,15 @@ ClipboardFactory::ClipboardFactory() : { } - - ClipboardFactory::~ClipboardFactory() { } - - Reference< XInterface > ClipboardFactory::createInstance() throw(std::exception) { return createInstanceWithArguments( Sequence< Any >() ); } - - Reference< XInterface > ClipboardFactory::createInstanceWithArguments( const Sequence< Any >& arguments ) throw(std::exception) { SolarMutexGuard aGuard; @@ -345,7 +334,6 @@ void GenericDragSource::initialize( const Sequence< Any >& ) throw( Exception, s { } - Sequence< OUString > SAL_CALL DragSource_getSupportedServiceNames() { #if defined UNX @@ -498,7 +486,6 @@ Reference< XInterface > SAL_CALL DropTarget_createInstance( const Reference< XMu return xResult; } - } // namespace vcl /* diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx index 7eb2f1f86ff2..4bfba8a3e94e 100644 --- a/vcl/source/components/fontident.cxx +++ b/vcl/source/components/fontident.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/svapp.hxx" #include "vcl/font.hxx" @@ -41,8 +40,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::awt; - - namespace vcl { @@ -53,7 +50,6 @@ public: FontIdentificator() {} virtual ~FontIdentificator(); - // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Bool SAL_CALL supportsService( const OUString& ) throw (RuntimeException, std::exception) SAL_OVERRIDE; @@ -67,8 +63,6 @@ FontIdentificator() {} }; - - FontIdentificator::~FontIdentificator() { } diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 3086de5cbb40..4638bd04a24e 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/debug.hxx> #include <tools/lineend.hxx> #include <tools/poly.hxx> @@ -42,8 +41,6 @@ #include <window.h> #include <controldata.hxx> - - #define PUSHBUTTON_VIEW_STYLE (WB_3DLOOK | \ WB_LEFT | WB_CENTER | WB_RIGHT | \ WB_TOP | WB_VCENTER | WB_BOTTOM | \ @@ -60,8 +57,6 @@ WB_TOP | WB_VCENTER | WB_BOTTOM | \ WB_WORDBREAK | WB_NOLABEL) - - class ImplCommonButtonData { public: @@ -79,7 +74,6 @@ public: ~ImplCommonButtonData(); }; - ImplCommonButtonData::ImplCommonButtonData() : maFocusRect(), mnSeparatorX(0), mnButtonState(0), mbSmallSymbol(false), maImage(), meImageAlign(IMAGEALIGN_TOP), meSymbolAlign(SYMBOLALIGN_LEFT) { @@ -95,7 +89,6 @@ Button::Button( WindowType nType ) : mpButtonData = new ImplCommonButtonData; } - Button::~Button() { delete mpButtonData; @@ -149,7 +142,6 @@ OUString Button::GetStandardText( StandardButtonType eButton ) return ResId(nResId, *pResMgr).toString(); } - bool Button::SetModeImage( const Image& rImage ) { if ( rImage != mpButtonData->maImage ) @@ -161,13 +153,11 @@ bool Button::SetModeImage( const Image& rImage ) return true; } - const Image Button::GetModeImage( ) const { return mpButtonData->maImage; } - bool Button::HasImage() const { return !!(mpButtonData->maImage); @@ -1080,8 +1070,6 @@ void PushButton::ImplDrawPushButton( bool bLayout ) } } - - void PushButton::ImplSetDefButton( bool bSet ) { Size aSize( GetSizePixel() ); diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 8dd8022724c8..521d13ab1d97 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <set> #include <comphelper/string.hxx> #include <tools/debug.hxx> @@ -1362,7 +1361,6 @@ Rectangle ComboBox::GetBoundingRectangle( sal_Int32 nItem ) const return aRect; } - void ComboBox::SetBorderStyle( sal_uInt16 nBorderStyle ) { Window::SetBorderStyle( nBorderStyle ); @@ -1373,7 +1371,6 @@ void ComboBox::SetBorderStyle( sal_uInt16 nBorderStyle ) } } - long ComboBox::GetIndexForPoint( const Point& rPoint, sal_Int32& rPos ) const { if( !HasLayoutData() ) diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index e1bfbca514f0..6c9c3bb489d4 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <comphelper/processfactory.hxx> #include <tools/rc.h> @@ -71,7 +70,6 @@ Control::~Control() delete mpControlData, mpControlData = NULL; } - void Control::EnableRTL( bool bEnable ) { // convenience: for controls also switch layout mode @@ -338,7 +336,6 @@ void Control::SetLayoutDataParent( const Control* pParent ) const mpControlData->mpLayoutData->m_pParent = pParent; } - void Control::ImplClearLayoutData() const { delete mpControlData->mpLayoutData, mpControlData->mpLayoutData = NULL; diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 080353239de7..66082155c108 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/rc.h> #include <vcl/decoview.hxx> #include <vcl/event.hxx> @@ -36,7 +35,6 @@ #include <osl/mutex.hxx> - #include <com/sun/star/i18n/BreakIterator.hpp> #include <com/sun/star/i18n/CharacterIteratorMode.hpp> #include <com/sun/star/i18n/WordType.hpp> @@ -111,7 +109,6 @@ struct DDInfo } }; - struct Impl_IMEInfos { OUString aOldTextAfterStartPos; @@ -128,7 +125,6 @@ struct Impl_IMEInfos void DestroyAttribs(); }; - Impl_IMEInfos::Impl_IMEInfos(sal_Int32 nP, const OUString& rOldTextAfterStartPos) : aOldTextAfterStartPos(rOldTextAfterStartPos) { @@ -842,7 +838,6 @@ void Edit::ImplInsertText( const OUString& rStr, const Selection* pNewSel, bool aSelection.Min() > 0 && /* first char needs not to be checked */ xBI.is() && i18n::ScriptType::COMPLEX == xBI->getScriptType( rStr, 0 ); - uno::Reference < i18n::XExtendedInputSequenceChecker > xISC; if (bIsInputSequenceChecking && (xISC = ImplGetInputSequenceChecker()).is()) { @@ -2124,7 +2119,6 @@ void Edit::Command( const CommandEvent& rCEvt ) } } - if ( pData->GetTextAttr() ) { mpIMEInfos->CopyAttribs( pData->GetTextAttr(), pData->GetText().getLength() ); @@ -2839,7 +2833,6 @@ void Edit::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::Dra mpDDInfo->bStarterOfDD = true; mpDDInfo->aDndStartSel = aSel; - if ( IsTracking() ) EndTracking(); // Vor D&D Tracking ausschalten diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index b0ae9bb898f8..c70bf09a1f4a 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -39,7 +39,6 @@ #include <com/sun/star/i18n/XCharacterClassification.hpp> #include <com/sun/star/i18n/KCharacterType.hpp> - #include <unotools/localedatawrapper.hxx> #include <unotools/calendarwrapper.hxx> #include <unotools/charclass.hxx> @@ -1362,7 +1361,6 @@ void DateField::ImplDateSpinArea( bool bUp ) } } - switch( eFormat ) { case XTDATEF_SHORT_MMDDYY: diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index a336879f5d7e..7df62f8c606f 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tools/rc.h" #include "vcl/decoview.hxx" diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx index d9fdb2d75c67..97142fb6077b 100644 --- a/vcl/source/control/group.cxx +++ b/vcl/source/control/group.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/rc.h> #include <vcl/event.hxx> diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index 4c0ba9dc4642..ee3d2a2733c3 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/debug.hxx> #include <vcl/svapp.hxx> @@ -76,8 +75,6 @@ void ImplInitFieldSettings( Window* pWin, bool bFont, bool bForeground, bool bBa } } - - void ImplInitDropDownButton( PushButton* pButton ) { if ( pButton->GetSettings().GetStyleSettings().GetOptions() & STYLE_OPTION_SPINUPDOWN ) @@ -491,7 +488,6 @@ sal_Int32 ImplEntryList::FindFirstSelectable( sal_Int32 nPos, bool bForward /* = return LISTBOX_ENTRY_NOTFOUND; } - ImplListBoxWindow::ImplListBoxWindow( Window* pParent, WinBits nWinStyle ) : Control( pParent, 0 ), maQuickSelectionEngine( *this ) @@ -1635,7 +1631,6 @@ bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) return bDone; } - namespace { static ::vcl::StringEntryIdentifier lcl_getEntry( const ImplEntryList& _rList, sal_Int32 _nPos, OUString& _out_entryText ) diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx index f143ab13331d..e49af86885e6 100644 --- a/vcl/source/control/imgctrl.cxx +++ b/vcl/source/control/imgctrl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/event.hxx> #include <vcl/imgctrl.hxx> #include <tools/rcid.h> diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index 4bd5e43fba47..ed5558dd045f 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -470,12 +470,10 @@ LongCurrencyField::LongCurrencyField( Window* pParent, WinBits nWinStyle ) : Reformat(); } - LongCurrencyField::~LongCurrencyField() { } - bool LongCurrencyField::PreNotify( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == EVENT_KEYINPUT ) @@ -486,7 +484,6 @@ bool LongCurrencyField::PreNotify( NotifyEvent& rNEvt ) return SpinField::PreNotify( rNEvt ); } - bool LongCurrencyField::Notify( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == EVENT_GETFOCUS ) @@ -504,14 +501,12 @@ bool LongCurrencyField::Notify( NotifyEvent& rNEvt ) return SpinField::Notify( rNEvt ); } - void LongCurrencyField::Modify() { MarkToBeReformatted( true ); SpinField::Modify(); } - void LongCurrencyField::Up() { BigInt nValue = GetValue(); @@ -534,14 +529,12 @@ void LongCurrencyField::Down() SpinField::Down(); } - void LongCurrencyField::First() { ImplNewLongCurrencyFieldValue( this, mnFirst ); SpinField::First(); } - void LongCurrencyField::Last() { ImplNewLongCurrencyFieldValue( this, mnLast ); @@ -569,7 +562,6 @@ bool LongCurrencyBox::PreNotify( NotifyEvent& rNEvt ) return ComboBox::PreNotify( rNEvt ); } - bool LongCurrencyBox::Notify( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == EVENT_GETFOCUS ) diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index 6db3350c50a9..c978fe4d366f 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tools/rc.h" #include "tools/debug.hxx" @@ -48,14 +47,12 @@ ListBox::ListBox( WindowType nType ) : Control( nType ) ImplInitListBoxData(); } - ListBox::ListBox( Window* pParent, WinBits nStyle ) : Control( WINDOW_LISTBOX ) { ImplInitListBoxData(); ImplInit( pParent, nStyle ); } - ListBox::ListBox( Window* pParent, const ResId& rResId ) : Control( WINDOW_LISTBOX ) { @@ -69,7 +66,6 @@ ListBox::ListBox( Window* pParent, const ResId& rResId ) : Show(); } - ListBox::~ListBox() { ImplCallEventListeners( VCLEVENT_OBJECT_DYING ); @@ -85,7 +81,6 @@ ListBox::~ListBox() delete mpBtn; } - void ListBox::ImplInitListBoxData() { mpFloatWin = NULL; @@ -99,7 +94,6 @@ void ListBox::ImplInitListBoxData() mbEdgeBlending = false; } - void ListBox::ImplInit( Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle( nStyle ); @@ -252,14 +246,12 @@ IMPL_LINK( ListBox, ImplListItemSelectHdl, void*, EMPTYARG ) return 1; } - IMPL_LINK_NOARG(ListBox, ImplScrollHdl) { ImplCallEventListeners( VCLEVENT_LISTBOX_SCROLLED ); return 1; } - IMPL_LINK_NOARG(ListBox, ImplCancelHdl) { if( IsInDropDown() ) @@ -268,7 +260,6 @@ IMPL_LINK_NOARG(ListBox, ImplCancelHdl) return 1; } - IMPL_LINK( ListBox, ImplSelectionChangedHdl, void*, n ) { if ( !mpImplLB->IsTrackingSelect() ) @@ -300,14 +291,12 @@ IMPL_LINK( ListBox, ImplSelectionChangedHdl, void*, n ) return 1; } - IMPL_LINK_NOARG(ListBox, ImplDoubleClickHdl) { DoubleClick(); return 1; } - IMPL_LINK_NOARG(ListBox, ImplClickBtnHdl) { if( !mpFloatWin->IsInPopupMode() ) @@ -560,7 +549,6 @@ void ListBox::DataChanged( const DataChangedEvent& rDCEvt ) ImplInitDropDownButton( mpBtn ); } - if ( IsDropDownBox() ) Invalidate(); } @@ -1506,7 +1494,6 @@ MultiListBox::MultiListBox( Window* pParent, WinBits nStyle ) : EnableMultiSelection( true ); } - MultiListBox::MultiListBox( Window* pParent, const ResId& rResId ) : ListBox( WINDOW_MULTILISTBOX ) { diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx index 16955e89e5c0..7f263b685ae6 100644 --- a/vcl/source/control/menubtn.cxx +++ b/vcl/source/control/menubtn.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/rc.h> #include <vcl/decoview.hxx> #include <vcl/event.hxx> @@ -74,7 +73,6 @@ OString MenuButton::GetCurItemIdent() const mpMenu->GetItemIdent(mnCurItemId) : OString(); } - MenuButton::MenuButton( Window* pParent, WinBits nWinBits ) : PushButton( WINDOW_MENUBUTTON ) { @@ -128,7 +126,6 @@ IMPL_LINK_NOARG(MenuButton, ImplMenuTimeoutHdl) return 0; } - void MenuButton::MouseButtonDown( const MouseEvent& rMEvt ) { bool bExecute = true; @@ -162,7 +159,6 @@ void MenuButton::MouseButtonDown( const MouseEvent& rMEvt ) } } - void MenuButton::KeyInput( const KeyEvent& rKEvt ) { KeyCode aKeyCode = rKEvt.GetKeyCode(); @@ -177,19 +173,16 @@ void MenuButton::KeyInput( const KeyEvent& rKEvt ) PushButton::KeyInput( rKEvt ); } - void MenuButton::Activate() { maActivateHdl.Call( this ); } - void MenuButton::Select() { maSelectHdl.Call( this ); } - void MenuButton::SetMenuMode( sal_uInt16 nMode ) { // FIXME: It's better to not inline this for 5.1; in 6.0 we can make it inline, however diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx index c14df7b195df..8bbaafcede8c 100644 --- a/vcl/source/control/prgsbar.cxx +++ b/vcl/source/control/prgsbar.cxx @@ -126,7 +126,6 @@ void ProgressBar::ImplInitSettings( bool bFont, } } - void ProgressBar::ImplDrawProgress( sal_uInt16 nOldPerc, sal_uInt16 nNewPerc ) { if ( mbCalcNew ) @@ -161,7 +160,6 @@ void ProgressBar::Paint( const Rectangle& ) ImplDrawProgress( 0, mnPercent ); } - void ProgressBar::Resize() { mbCalcNew = true; diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx index d0b72391261f..25d136a0218e 100644 --- a/vcl/source/control/quickselectionengine.cxx +++ b/vcl/source/control/quickselectionengine.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/quickselectionengine.hxx" #include "vcl/event.hxx" #include "vcl/timer.hxx" diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index fcd035cb27f8..32d977702fde 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/event.hxx" #include "vcl/decoview.hxx" #include "vcl/scrbar.hxx" @@ -1368,7 +1367,6 @@ void ScrollBar::SetRangeMin( long nNewRange ) SetRange( Range( nNewRange, GetRangeMax() ) ); } - void ScrollBar::SetRangeMax( long nNewRange ) { SetRange( Range( GetRangeMin(), nNewRange ) ); diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx index a52ede4551ce..f398d02a38e3 100644 --- a/vcl/source/control/slider.cxx +++ b/vcl/source/control/slider.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/rc.h> #include <vcl/event.hxx> #include <vcl/decoview.hxx> @@ -26,8 +25,6 @@ #include "thumbpos.hxx" - - #define SLIDER_DRAW_THUMB ((sal_uInt16)0x0001) #define SLIDER_DRAW_CHANNEL1 ((sal_uInt16)0x0002) #define SLIDER_DRAW_CHANNEL2 ((sal_uInt16)0x0004) @@ -48,8 +45,6 @@ #define SLIDER_VIEW_STYLE (WB_3DLOOK | WB_HORZ | WB_VERT) - - void Slider::ImplInit( Window* pParent, WinBits nStyle ) { mnThumbPixOffset = 0; diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx index 6ecc05d68671..d920737c3c01 100644 --- a/vcl/source/control/spinbtn.cxx +++ b/vcl/source/control/spinbtn.cxx @@ -169,7 +169,6 @@ void SpinButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, pDev->Pop(); } - void SpinButton::Paint( const Rectangle& ) { HideFocus(); diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 9091c1d93aa8..325e770e1060 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tools/rc.h" #include "vcl/event.hxx" @@ -29,8 +28,6 @@ #include "controldata.hxx" #include "svdata.hxx" - - namespace { void ImplGetSpinbuttonValue( Window *pWin, const Rectangle& rUpperRect, @@ -74,7 +71,6 @@ void ImplGetSpinbuttonValue( Window *pWin, const Rectangle& rUpperRect, rValue.mnLowerPart = bHorz ? PART_BUTTON_RIGHT : PART_BUTTON_DOWN; } - bool ImplDrawNativeSpinfield( Window *pWin, const SpinbuttonValue& rSpinbuttonValue ) { bool bNativeOK = false; diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 3080f23edf24..1d736a7f3a7a 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tools/debug.hxx" #include "tools/rc.h" @@ -40,8 +39,6 @@ #include <boost/unordered_map.hpp> #include <vector> - - struct ImplTabItem { sal_uInt16 mnId; @@ -63,7 +60,6 @@ struct ImplTabItem {} }; - struct ImplTabCtrlData { boost::unordered_map< int, int > maLayoutPageIdToLine; @@ -74,7 +70,6 @@ struct ImplTabCtrlData ListBox* mpListBox; }; - #define TAB_OFFSET 3 #define TAB_TABOFFSET_X 3 #define TAB_TABOFFSET_Y 3 @@ -137,7 +132,6 @@ const Font& TabControl::GetCanonicalFont( const StyleSettings& _rStyle ) const return _rStyle.GetAppFont(); } - const Color& TabControl::GetCanonicalTextColor( const StyleSettings& _rStyle ) const { return _rStyle.GetButtonTextColor(); diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx index 05375c091c42..c9b3b77a0be5 100644 --- a/vcl/source/edit/textdat2.hxx +++ b/vcl/source/edit/textdat2.hxx @@ -77,8 +77,6 @@ public: bool HasValidSize() const { return nWidth != (-1); } }; - - typedef std::vector<TETextPortion*> TextPortionArray; class TETextPortionList : public TextPortionArray @@ -186,8 +184,6 @@ inline bool TextLine::operator != ( const TextLine& rLine ) const return !( *this == rLine ); } - - class TEParaPortion { private: @@ -197,21 +193,18 @@ private: TETextPortionList maTextPortions; std::vector<TEWritingDirectionInfo> maWritingDirectionInfos; - sal_uInt16 mnInvalidPosStart; short mnInvalidDiff; bool mbInvalid; bool mbSimple; // nur lineares Tippen - TEParaPortion( const TEParaPortion& ) {;} public: TEParaPortion( TextNode* pNode ); ~TEParaPortion(); - bool IsInvalid() const { return mbInvalid; } bool IsSimpleInvalid() const { return mbSimple; } void SetNotSimpleInvalid() { mbSimple = false; } @@ -228,12 +221,10 @@ public: TETextPortionList& GetTextPortions() { return maTextPortions; } std::vector<TEWritingDirectionInfo>& GetWritingDirectionInfos() { return maWritingDirectionInfos; } - sal_uInt16 GetLineNumber( sal_uInt16 nIndex, bool bInclEnd ); void CorrectValuesBehindLastFormattedLine( sal_uInt16 nLastFormattedLine ); }; - class TEParaPortions : public ToolsList<TEParaPortion*> { public: @@ -242,7 +233,6 @@ public: void Reset(); }; - class TextSelFunctionSet: public FunctionSet { private: @@ -264,7 +254,6 @@ public: virtual void DestroyAnchor() SAL_OVERRIDE; }; - class IdleFormatter : public Timer { private: diff --git a/vcl/source/edit/textdata.cxx b/vcl/source/edit/textdata.cxx index 892ffc1f4dba..f375525e7d4a 100644 --- a/vcl/source/edit/textdata.cxx +++ b/vcl/source/edit/textdata.cxx @@ -17,13 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/textdata.hxx> #include <textdat2.hxx> #include <tools/debug.hxx> - TextSelection::TextSelection() { } @@ -48,7 +46,6 @@ void TextSelection::Justify() } } - TETextPortionList::TETextPortionList() { } @@ -95,7 +92,6 @@ sal_uInt16 TETextPortionList::FindPortion( sal_uInt16 nCharPos, sal_uInt16& nPor return ( size() - 1 ); } - TEParaPortion::TEParaPortion( TextNode* pN ) { mpNode = pN; @@ -181,7 +177,6 @@ sal_uInt16 TEParaPortion::GetLineNumber( sal_uInt16 nChar, bool bInclEnd ) return ( maLines.size() - 1 ); } - void TEParaPortion::CorrectValuesBehindLastFormattedLine( sal_uInt16 nLastFormattedLine ) { sal_uInt16 nLines = maLines.size(); @@ -315,5 +310,4 @@ void TEIMEInfos::DestroyAttribs() nLen = 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx index 698e521c32b5..e96dacde26fb 100644 --- a/vcl/source/edit/textdoc.cxx +++ b/vcl/source/edit/textdoc.cxx @@ -63,7 +63,6 @@ void TextCharAttribList::Clear( bool bDestroyAttribs ) TextCharAttribs::clear(); } - void TextCharAttribList::InsertAttrib( TextCharAttrib* pAttrib ) { if ( pAttrib->IsEmpty() ) @@ -485,7 +484,6 @@ OUString TextDoc::GetText( sal_uLong nPara ) const return aText; } - sal_uLong TextDoc::GetTextLen( const sal_Unicode* pSep, const TextSelection* pSel ) const { sal_uLong nLen = 0; diff --git a/vcl/source/edit/textdoc.hxx b/vcl/source/edit/textdoc.hxx index 06623ce218dd..1f42c3a0f7c8 100644 --- a/vcl/source/edit/textdoc.hxx +++ b/vcl/source/edit/textdoc.hxx @@ -66,7 +66,6 @@ public: bool HasBoundingAttrib( sal_uInt16 nBound ); }; - class TextNode { private: @@ -81,7 +80,6 @@ protected: public: TextNode( const OUString& rText ); - const OUString& GetText() const { return maText; } const TextCharAttribList& GetCharAttribs() const { return maCharAttribs; } diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index 74fb8bcf045a..c19f5df28648 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -63,7 +63,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::rtl; - TextEngine::TextEngine() { mpDoc = 0; @@ -479,7 +478,6 @@ void TextEngine::SetText( const OUString& rText ) DBG_ASSERT( !HasUndoManager() || !GetUndoManager().GetUndoActionCount(), "SetText: Undo!" ); } - void TextEngine::CursorMoved( sal_uLong nNode ) { // delete empty attribute; but only if paragraph is not empty! @@ -749,7 +747,6 @@ TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& rCurSel, // at this point now we will insert the character 'normally' some lines below... } - if ( IsUndoEnabled() && !IsInUndo() ) { TextUndoInsertChars* pNewUndo = new TextUndoInsertChars( this, aPaM, OUString(c) ); @@ -772,7 +769,6 @@ TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& rCurSel, return aPaM; } - TextPaM TextEngine::ImpInsertText( const TextSelection& rCurSel, const OUString& rStr ) { UndoActionStart(); @@ -1153,7 +1149,6 @@ sal_uInt16 TextEngine::GetCharPos( sal_uLong nPortion, sal_uInt16 nLine, long nX return nCurIndex; } - sal_uLong TextEngine::GetTextHeight() const { DBG_ASSERT( GetUpdateMode(), "GetTextHeight: GetUpdateMode()" ); @@ -1479,7 +1474,6 @@ void TextEngine::FormatAndUpdate( TextView* pCurView ) } } - void TextEngine::IdleFormatAndUpdate( TextView* pCurView, sal_uInt16 nMaxTimerRestarts ) { mpIdleFormatter->DoIdleFormat( pCurView, nMaxTimerRestarts ); @@ -2746,7 +2740,6 @@ void TextEngine::SetTextAlign( TxtAlign eAlign ) } } - void TextEngine::ValidateSelection( TextSelection& rSel ) const { ValidatePaM( rSel.GetStart() ); @@ -2767,7 +2760,6 @@ void TextEngine::ValidatePaM( TextPaM& rPaM ) const rPaM.GetIndex() = nMaxIndex; } - // adjust State & Selection void TextEngine::ImpParagraphInserted( sal_uLong nPara ) @@ -2951,7 +2943,6 @@ void TextEngine::ImpInitWritingDirections( sal_uLong nPara ) const UBiDiLevel nBidiLevel = IsRightToLeft() ? 1 /*RTL*/ : 0 /*LTR*/; OUString aText( pParaPortion->GetNode()->GetText() ); - // Bidi functions from icu 2.0 UErrorCode nError = U_ZERO_ERROR; diff --git a/vcl/source/edit/textund2.hxx b/vcl/source/edit/textund2.hxx index 8a5a917dd3a4..b469a3bad618 100644 --- a/vcl/source/edit/textund2.hxx +++ b/vcl/source/edit/textund2.hxx @@ -22,7 +22,6 @@ #include "textundo.hxx" #include <vcl/textdata.hxx> - class TextUndoDelPara : public TextUndo { private: @@ -41,7 +40,6 @@ public: virtual OUString GetComment () const SAL_OVERRIDE; }; - class TextUndoConnectParas : public TextUndo { private: @@ -59,7 +57,6 @@ public: virtual OUString GetComment () const SAL_OVERRIDE; }; - class TextUndoSplitPara : public TextUndo { private: @@ -77,7 +74,6 @@ public: virtual OUString GetComment () const SAL_OVERRIDE; }; - class TextUndoInsertChars : public TextUndo { private: @@ -96,7 +92,6 @@ public: virtual OUString GetComment () const SAL_OVERRIDE; }; - class TextUndoRemoveChars : public TextUndo { private: @@ -113,7 +108,6 @@ public: virtual OUString GetComment () const SAL_OVERRIDE; }; - class TextUndoSetAttribs: public TextUndo { private: diff --git a/vcl/source/edit/textundo.cxx b/vcl/source/edit/textundo.cxx index 6cd4f339d642..59781e1d585d 100644 --- a/vcl/source/edit/textundo.cxx +++ b/vcl/source/edit/textundo.cxx @@ -36,7 +36,6 @@ TYPEINIT1( TextUndoSplitPara, TextUndo ); TYPEINIT1( TextUndoInsertChars, TextUndo ); TYPEINIT1( TextUndoRemoveChars, TextUndo ); - namespace { @@ -65,7 +64,6 @@ void Shorten (OUString& rString) } // namespace - TextUndoManager::TextUndoManager( TextEngine* p ) { mpTextEngine = p; @@ -96,7 +94,6 @@ bool TextUndoManager::Redo() if ( GetRedoActionCount() == 0 ) return false; - UndoRedoStart(); mpTextEngine->SetIsInUndo( true ); diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index 6c4f039397ab..c3593f8e8d9e 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -51,12 +51,10 @@ #include <vcl/edit.hxx> - #include <sot/exchange.hxx> #include <osl/mutex.hxx> - using namespace ::com::sun::star; class TETextDataObject : public ::com::sun::star::datatransfer::XTransferable, @@ -908,7 +906,6 @@ void TextView::MouseButtonDown( const MouseEvent& rMouseEvent ) } } - void TextView::MouseMove( const MouseEvent& rMouseEvent ) { mpImpl->mnTravelXPos = TRAVEL_X_DONTKNOW; @@ -1412,7 +1409,6 @@ TextPaM TextView::CursorRight( const TextPaM& rPaM, sal_uInt16 nCharacterIterato return aPaM; } - TextPaM TextView::CursorWordLeft( const TextPaM& rPaM ) { TextPaM aPaM( rPaM ); @@ -1435,7 +1431,6 @@ TextPaM TextView::CursorWordLeft( const TextPaM& rPaM ) return aPaM; } - TextPaM TextView::CursorWordRight( const TextPaM& rPaM ) { TextPaM aPaM( rPaM ); @@ -1522,8 +1517,6 @@ TextPaM TextView::ImpDelete( sal_uInt8 nMode, sal_uInt8 nDelMode ) return mpImpl->mpTextEngine->ImpDeleteText( TextSelection( aStartPaM, aEndPaM ) ); } - - TextPaM TextView::CursorUp( const TextPaM& rPaM ) { TextPaM aPaM( rPaM ); @@ -1705,7 +1698,6 @@ void TextView::ImpShowCursor( bool bGotoCursor, bool bForceVisCursor, bool bSpec if ( !mpImpl->mpTextEngine->IsFormatted() ) mpImpl->mpTextEngine->FormatAndUpdate( this ); - TextPaM aPaM( mpImpl->maSelection.GetEnd() ); Rectangle aEditCursor = mpImpl->mpTextEngine->PaMtoEditCursor( aPaM, bSpecial ); @@ -2003,7 +1995,6 @@ void TextView::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd: if ( mpImpl->mpTextEngine->HasAttrib( TEXTATTR_HYPERLINK ) ) // then also as HTML mpImpl->mpTextEngine->Write( pDataObj->GetHTMLStream(), &mpImpl->maSelection, true ); - /* // D&D of a Hyperlink // TODO: Better would be to store MBDownPaM in MBDown, @@ -2270,8 +2261,6 @@ sal_Int32 TextView::GetLineNumberOfCursorInSelection() const return nLineNo; } - - // (+) class TextSelFunctionSet TextSelFunctionSet::TextSelFunctionSet( TextView* pView ) diff --git a/vcl/source/edit/txtattr.cxx b/vcl/source/edit/txtattr.cxx index a9fe2df06957..c7d0c592a44d 100644 --- a/vcl/source/edit/txtattr.cxx +++ b/vcl/source/edit/txtattr.cxx @@ -17,13 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/txtattr.hxx> #include <vcl/font.hxx> - - - TextAttrib::~TextAttrib() { } @@ -33,7 +29,6 @@ bool TextAttrib::operator==( const TextAttrib& rAttr ) const return mnWhich == rAttr.mnWhich; } - TextAttribFontColor::TextAttribFontColor( const Color& rColor ) : TextAttrib( TEXTATTR_FONTCOLOR ), maColor( rColor ) { @@ -94,7 +89,6 @@ bool TextAttribFontWeight::operator==( const TextAttrib& rAttr ) const ( meWeight == ((const TextAttribFontWeight&)rAttr).meWeight ) ); } - TextAttribHyperLink::TextAttribHyperLink( const TextAttribHyperLink& rAttr ) : TextAttrib( rAttr ), maURL( rAttr.maURL ), maDescription( rAttr.maDescription ) { diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index 117082c1b6fd..4e1deac8a0bb 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -34,7 +34,6 @@ #include <vcl/settings.hxx> #include <boost/scoped_ptr.hpp> - class TextWindow : public Window { private: @@ -79,7 +78,6 @@ public: void SetTextSelectable( bool bTextSelectable ) { mbTextSelectable = bTextSelectable; } }; - class ImpVclMEdit : public SfxListener { private: @@ -712,7 +710,6 @@ bool ImpVclMEdit::HandleCommand( const CommandEvent& rCEvt ) return bDone; } - TextWindow::TextWindow( Window* pParent ) : Window( pParent ) { mbInMBDown = false; @@ -1001,7 +998,6 @@ WinBits VclMultiLineEdit::ImplInitStyle( WinBits nStyle ) return nStyle; } - void VclMultiLineEdit::ImplInitSettings( bool /*bFont*/, bool /*bForeground*/, bool bBackground ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -1522,7 +1518,6 @@ bool VclMultiLineEdit::PreNotify( NotifyEvent& rNEvt ) return nDone || Edit::PreNotify( rNEvt ); } - // Internals for derived classes, e.g. TextComponent ExtTextEngine* VclMultiLineEdit::GetTextEngine() const diff --git a/vcl/source/edit/xtextedt.cxx b/vcl/source/edit/xtextedt.cxx index 04555e68acf5..6f63ccecb9a0 100644 --- a/vcl/source/edit/xtextedt.cxx +++ b/vcl/source/edit/xtextedt.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/xtextedt.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> @@ -27,7 +26,6 @@ using namespace ::com::sun::star; - ExtTextEngine::ExtTextEngine() : maGroupChars(OUString("(){}[]")) { } @@ -222,8 +220,6 @@ bool ExtTextEngine::Search( TextSelection& rSel, const util::SearchOptions& rSea return bFound; } - - // class ExtTextView ExtTextView::ExtTextView( ExtTextEngine* pEng, Window* pWindow ) diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx index 9d45c268cf94..7f4ed6d42e1c 100644 --- a/vcl/source/filter/FilterConfigCache.cxx +++ b/vcl/source/filter/FilterConfigCache.cxx @@ -440,8 +440,6 @@ bool FilterConfigCache::IsImportPixelFormat( sal_uInt16 nFormat ) return (nFormat < aImport.size()) && aImport[ nFormat ].bIsPixelFormat; } - - OUString FilterConfigCache::GetExportFilterName( sal_uInt16 nFormat ) { if( nFormat < aExport.size() ) diff --git a/vcl/source/filter/FilterConfigItem.cxx b/vcl/source/filter/FilterConfigItem.cxx index 88afc3fa0c20..7a2e823f16b9 100644 --- a/vcl/source/filter/FilterConfigItem.cxx +++ b/vcl/source/filter/FilterConfigItem.cxx @@ -229,7 +229,6 @@ bool FilterConfigItem::ImplGetPropertyValue( Any& rAny, const Reference< XProper return bRetValue; } - // if property is available it returns a pointer, // otherwise the result is null PropertyValue* FilterConfigItem::GetPropertyValue( Sequence< PropertyValue >& rPropSeq, const OUString& rName ) @@ -400,15 +399,11 @@ void FilterConfigItem::WriteInt32( const OUString& rKey, sal_Int32 nNewValue ) } } - - Sequence< PropertyValue > FilterConfigItem::GetFilterData() const { return aFilterData; } - - Reference< XStatusIndicator > FilterConfigItem::GetStatusIndicator() const { Reference< XStatusIndicator > xStatusIndicator; diff --git a/vcl/source/filter/GraphicNativeTransform.cxx b/vcl/source/filter/GraphicNativeTransform.cxx index 9661d4a67f97..664749790d38 100644 --- a/vcl/source/filter/GraphicNativeTransform.cxx +++ b/vcl/source/filter/GraphicNativeTransform.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/XPropertySet.hpp> - #include "jpeg/Exif.hxx" #include "jpeg/JpegTransform.hxx" @@ -189,5 +188,4 @@ bool GraphicNativeTransform::rotateJPEG(sal_uInt16 aRotation) return true; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 48b88baf99c1..d0e639a012c9 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -181,7 +181,6 @@ sal_uInt8* ImplSearchEntry( sal_uInt8* pSource, sal_uInt8* pDest, sal_uLong nCom return NULL; } - inline OUString ImpGetExtension( const OUString &rPath ) { OUString aExt; @@ -227,7 +226,6 @@ bool isPCT(SvStream& rStream, sal_uLong nStreamPos, sal_uLong nStreamLen) return false; } - /************************************************************************* * * ImpPeekGraphicFormat() @@ -774,8 +772,6 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, return bTest && !bSomethingTested; } - - sal_uInt16 GraphicFilter::ImpTestOrFindFormat( const OUString& rPath, SvStream& rStream, sal_uInt16& rFormat ) { // determine or check the filter/format by reading into it @@ -820,8 +816,6 @@ sal_uInt16 GraphicFilter::ImpTestOrFindFormat( const OUString& rPath, SvStream& return GRFILTER_OK; } - - #ifndef DISABLE_EXPORT static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& rConfigItem ) @@ -844,7 +838,6 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r nMode = 2; } - Size aOriginalSize; Size aPrefSize( rGraphic.GetPrefSize() ); MapMode aPrefMapMode( rGraphic.GetPrefMapMode() ); @@ -1331,8 +1324,6 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat return ImportGraphic( rGraphic, rPath, rIStream, nFormat, pDeterminedFormat, nImportFlags, NULL, pExtHeader ); } - - sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPath, SvStream& rIStream, sal_uInt16 nFormat, sal_uInt16* pDeterminedFormat, sal_uInt32 nImportFlags, com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData, @@ -1867,7 +1858,6 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString INetURLObject aURL( rPath ); OUString aExt( aURL.GetFileExtension().toAsciiUpperCase() ); - for( sal_uInt16 i = 0; i < nFormatCount; i++ ) { if ( pConfig->GetExportFormatExtension( i ).equalsIgnoreAsciiCase( aExt ) ) @@ -1950,7 +1940,6 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString // save RLE encoded? WriteDIB(aBmp, rOStm, bRleCoding, true); - if( rOStm.GetError() ) nStatus = GRFILTER_IOERROR; } diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx index 812c2430fdf7..77da7eb4191b 100644 --- a/vcl/source/filter/graphicfilter2.cxx +++ b/vcl/source/filter/graphicfilter2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <string.h> #include <stdio.h> #include <tools/stream.hxx> @@ -457,7 +456,6 @@ bool GraphicDescriptor::ImpDetectPCX( SvStream& rStm, bool bExtendedInfo ) sal_uInt16 nDPIx; sal_uInt16 nDPIy; - rStm.SeekRel( 1 ); // compression diff --git a/vcl/source/filter/igif/decode.cxx b/vcl/source/filter/igif/decode.cxx index 561bf5c4480a..f53c00572f13 100644 --- a/vcl/source/filter/igif/decode.cxx +++ b/vcl/source/filter/igif/decode.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "decode.hxx" struct GIFLZWTableEntry diff --git a/vcl/source/filter/igif/decode.hxx b/vcl/source/filter/igif/decode.hxx index 3e1a783eaf0d..542532673359 100644 --- a/vcl/source/filter/igif/decode.hxx +++ b/vcl/source/filter/igif/decode.hxx @@ -46,7 +46,6 @@ class GIFLZWDecompressor void AddToTable(sal_uInt16 nPrevCode, sal_uInt16 nCodeFirstData); bool ProcessOneCode(); - public: GIFLZWDecompressor( sal_uInt8 cDataSize ); diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx index b3168a0194c6..a26a57af8f39 100644 --- a/vcl/source/filter/igif/gifread.cxx +++ b/vcl/source/filter/igif/gifread.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #define _GIFPRIVATE #include "decode.hxx" @@ -51,7 +50,6 @@ GIFReader::GIFReader( SvStream& rStm ) : ClearImageExtensions(); } - GIFReader::~GIFReader() { aImGraphic.SetContext( NULL ); @@ -635,7 +633,6 @@ bool GIFReader::ProcessGIF() } break; - // read extension case( EXTENSION_READING ): { @@ -644,7 +641,6 @@ bool GIFReader::ProcessGIF() } break; - // read Image-Descriptor case( LOCAL_HEADER_READING ): { @@ -656,7 +652,6 @@ bool GIFReader::ProcessGIF() } break; - // read first data block case( FIRST_BLOCK_READING ): { diff --git a/vcl/source/filter/ixbm/xbmread.cxx b/vcl/source/filter/ixbm/xbmread.cxx index 89f0d06bfcd4..b2910844843c 100644 --- a/vcl/source/filter/ixbm/xbmread.cxx +++ b/vcl/source/filter/ixbm/xbmread.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #define _XBMPRIVATE #include <ctype.h> #include <comphelper/string.hxx> diff --git a/vcl/source/filter/ixbm/xbmread.hxx b/vcl/source/filter/ixbm/xbmread.hxx index dc62ff446045..4f3b52e7e8af 100644 --- a/vcl/source/filter/ixbm/xbmread.hxx +++ b/vcl/source/filter/ixbm/xbmread.hxx @@ -57,7 +57,6 @@ class XBMReader : public GraphicReader long ParseDefine( const sal_Char* pDefine ); bool ParseData( SvStream* pInStm, const OString& aLastLine, XBMFormat eFormat ); - public: XBMReader( SvStream& rStm ); diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx index 5ed2f7425561..e3f48ecbf05b 100644 --- a/vcl/source/filter/ixpm/xpmread.cxx +++ b/vcl/source/filter/ixpm/xpmread.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/bmpacc.hxx> #include <vcl/graph.hxx> #include "rgbtable.hxx" @@ -51,8 +50,6 @@ XPMReader::~XPMReader() maBmp.ReleaseAccess( mpAcc ); } - - ReadState XPMReader::ReadXPM( Graphic& rGraphic ) { ReadState eReadState; @@ -208,7 +205,6 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic ) return eReadState; } - // ImplGetColor returns variouls colour values, // returns TRUE if various colours could be assigned @@ -227,7 +223,6 @@ bool XPMReader::ImplGetColor( sal_uLong nNumb ) return bStatus; } - // ImpGetScanLine reads the string mpBufSize and writes the pixel in the // Bitmap. Parameter nY is the horizontal position. @@ -293,7 +288,6 @@ bool XPMReader::ImplGetScanLine( sal_uLong nY ) return bStatus; } - // tries to determine a colour value from mpStringBuf // if a colour was found the RGB value is written a pDest[1]..pDest[2] // pDest[0] contains 0xFF if the colour is transparent otherwise 0 @@ -361,7 +355,6 @@ bool XPMReader::ImplGetColSub( sal_uInt8* pDest ) return bColStatus; } - // ImplGetColKey searches string mpStringBuf for a parameter 'nKey' // and returns a boolean. (if TRUE mpPara and mnParaSize will be set) @@ -405,7 +398,6 @@ bool XPMReader::ImplGetColKey( sal_uInt8 nKey ) return ( mnParaSize ) ? true : false; } - // ImplGetRGBHex translates the ASCII-Hexadecimalvalue belonging to mpPara // in a RGB value and writes this to pDest // below formats should be contained in mpPara: @@ -413,7 +405,6 @@ bool XPMReader::ImplGetColKey( sal_uInt8 nKey ) // 2 : '#1234abcd1234' " " " " // 6 : '#12345678abcdefab12345678' " " " " - void XPMReader::ImplGetRGBHex( sal_uInt8* pDest,sal_uLong nAdd ) { sal_uInt8* pPtr = mpPara+1; @@ -435,7 +426,6 @@ void XPMReader::ImplGetRGBHex( sal_uInt8* pDest,sal_uLong nAdd ) } } - // ImplGetUlong returns the value of a up to 6-digit long ASCII-decimal number. sal_uLong XPMReader::ImplGetULONG( sal_uLong nPara ) @@ -458,8 +448,6 @@ sal_uLong XPMReader::ImplGetULONG( sal_uLong nPara ) else return 0; } - - bool XPMReader::ImplCompare( sal_uInt8* pSource, sal_uInt8* pDest, sal_uLong nSize, sal_uLong nMode ) { bool bRet = true; @@ -489,7 +477,6 @@ bool XPMReader::ImplCompare( sal_uInt8* pSource, sal_uInt8* pDest, sal_uLong nSi return bRet; } - // ImplGetPara tries to retrieve nNumb (0...x) parameters from mpStringBuf. // Parameters are separated by spaces or tabs. // If a parameter was found then the return value is TRUE and mpPara + mnParaSize @@ -545,7 +532,6 @@ bool XPMReader::ImplGetPara ( sal_uLong nNumb ) return ( ( nCount == nNumb ) && ( mpPara ) ); } - // The next string is read and stored in mpStringBuf (terminated with 0); // mnStringSize contains the size of the string read. // Comments like '//' and '/*....*/' are skipped. @@ -644,10 +630,8 @@ bool XPMReader::ImplGetString( void ) return mbStatus; } - // - ImportXPM - - bool ImportXPM( SvStream& rStm, Graphic& rGraphic ) { XPMReader* pXPMReader = (XPMReader*) rGraphic.GetContext(); diff --git a/vcl/source/filter/ixpm/xpmread.hxx b/vcl/source/filter/ixpm/xpmread.hxx index d7ede08a225f..ad9911a06c44 100644 --- a/vcl/source/filter/ixpm/xpmread.hxx +++ b/vcl/source/filter/ixpm/xpmread.hxx @@ -35,7 +35,6 @@ #define XPMEXTENSIONS 0x00000006 #define XPMENDEXT 0x00000007 - #define XPMREMARK 0x00000001 // defines used by mnStatus #define XPMDOUBLE 0x00000002 #define XPMSTRING 0x00000004 diff --git a/vcl/source/filter/jpeg/Exif.hxx b/vcl/source/filter/jpeg/Exif.hxx index 4be2f94e1b1b..c365ec8071bf 100644 --- a/vcl/source/filter/jpeg/Exif.hxx +++ b/vcl/source/filter/jpeg/Exif.hxx @@ -87,7 +87,6 @@ public : }; - #endif // INCLUDED_VCL_SOURCE_FILTER_JPEG_EXIF_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/filter/jpeg/JpegTransform.cxx b/vcl/source/filter/jpeg/JpegTransform.cxx index 722ddbdb0ac2..a71b816f3f50 100644 --- a/vcl/source/filter/jpeg/JpegTransform.cxx +++ b/vcl/source/filter/jpeg/JpegTransform.cxx @@ -43,5 +43,4 @@ void JpegTransform::setRotate(sal_uInt16 aRotate) maRotate = aRotate; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/filter/jpeg/jinclude.h b/vcl/source/filter/jpeg/jinclude.h index 121fbecdf1ea..edd608deacf4 100644 --- a/vcl/source/filter/jpeg/jinclude.h +++ b/vcl/source/filter/jpeg/jinclude.h @@ -14,7 +14,6 @@ * JPEG library. Most applications need only include jpeglib.h. */ - /* Include auto-config file to find out which system include files we need. */ #include "jconfig.h" /* auto configuration options */ diff --git a/vcl/source/filter/jpeg/transupp.h b/vcl/source/filter/jpeg/transupp.h index 69bf46f876af..4448c9fa8272 100644 --- a/vcl/source/filter/jpeg/transupp.h +++ b/vcl/source/filter/jpeg/transupp.h @@ -76,7 +76,6 @@ * be aware of the option to know how many components to work on. */ - /* Short forms of external names for systems with brain-damaged linkers. */ #ifdef NEED_SHORT_EXTERNAL_NAMES @@ -89,7 +88,6 @@ #define jcopy_markers_execute jCMrkExec #endif /* NEED_SHORT_EXTERNAL_NAMES */ - /* * Codes for supported types of image transformations. */ @@ -162,7 +160,6 @@ typedef struct { int iMCU_sample_height; } jpeg_transform_info; - #if TRANSFORMS_SUPPORTED /* Parse a crop specification (written in X11 geometry style) */ @@ -198,7 +195,6 @@ EXTERN(boolean) jtransform_perfect_transform #endif /* TRANSFORMS_SUPPORTED */ - /* * Support for copying optional markers from source to destination file. */ diff --git a/vcl/source/filter/sgfbram.cxx b/vcl/source/filter/sgfbram.cxx index 1c691014275c..733b9c01b47a 100644 --- a/vcl/source/filter/sgfbram.cxx +++ b/vcl/source/filter/sgfbram.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <string.h> #include <osl/endian.h> #include <tools/stream.hxx> @@ -454,7 +453,6 @@ bool SgfFilterVect(SvStream& rInp, SgfHeader& rHead, SgfEntry&, GDIMetaFile& rMt return true; } - bool SgfVectFilter(SvStream& rInp, GDIMetaFile& rMtf) { sal_uLong nFileStart; // offset of SgfHeaders. Usually 0. diff --git a/vcl/source/filter/sgfbram.hxx b/vcl/source/filter/sgfbram.hxx index 72f4cec81a7a..501b2f26b635 100644 --- a/vcl/source/filter/sgfbram.hxx +++ b/vcl/source/filter/sgfbram.hxx @@ -37,7 +37,6 @@ #define SgfVectGray 5 /* use greyscale for lines only for */ #define SgfVectWdth 6 /* use line widths for lines SimpVector */ - #define SgfHeaderSize 42 class SgfHeader { diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx index d2c42cc6131a..a2e7c14122c6 100644 --- a/vcl/source/filter/sgvmain.cxx +++ b/vcl/source/filter/sgvmain.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <rtl/math.hxx> #include <osl/endian.h> #include <vcl/graph.hxx> @@ -599,7 +598,6 @@ void DrawSlideCirc(sal_Int16 cx, sal_Int16 cy, sal_Int16 rx, sal_Int16 ry, ObjAr } } - void CircType::Draw(OutputDevice& rOut) { Rectangle aRect(Center.x-Radius.x,Center.y-Radius.y,Center.x+Radius.x,Center.y+Radius.y); @@ -696,7 +694,6 @@ void BmapType::Draw(OutputDevice& rOut) } } - sal_uInt32 GrupType::GetSubPtr() { return sal_uInt32(SbLo)+0x00010000*sal_uInt32(SbHi); diff --git a/vcl/source/filter/sgvspln.cxx b/vcl/source/filter/sgvspln.cxx index b95fc50c8f44..f68652843759 100644 --- a/vcl/source/filter/sgvspln.cxx +++ b/vcl/source/filter/sgvspln.cxx @@ -17,10 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <math.h> - #include <tools/poly.hxx> #include <boost/scoped_array.hpp> @@ -32,7 +30,6 @@ extern "C" { /*.fe The include file u_const.h should be stored in the directory, */ /*.fe where the compiler searches for include files. */ - /*----------------------- FILE u_const.h ---------------------------*/ #define IEEE @@ -98,7 +95,6 @@ short basis() /* calculate BASE machine independence */ #define MAXEXPON 1023.0 /* largest exponent */ #define MINEXPON -1024.0 /* smallest exponent */ - #define MACH_EPS masch() #define POSMAX pow ((double) BASIS, MAXEXPON) @@ -114,16 +110,11 @@ short basis() /* calculate BASE machine independence */ /*-------------------- END of FILE u_const.h -----------------------*/ - - - - /*.HL appendix: C - programs*/ /*.HR Systems of equations for tridiagonal matrices*/ /*.FE P 3.7 tridiagonal systems of equations */ - /*---------------------- MODULE tridiagonal -----------------------*/ sal_uInt16 TriDiagGS(bool rep, sal_uInt16 n, double* lower, @@ -243,23 +234,13 @@ sal_uInt16 TriDiagGS(bool rep, sal_uInt16 n, double* lower, /*----------------------- END OF TRIDIAGONAL ------------------------*/ - - - - - - - - /*.HL Appendix: C - Programs*/ /*.HRSystems of equations with cyclic tridiagonal matrices*/ /*.FE P 3.8 Systems with cyclic tridiagonal matrices */ - /*---------------- Module cyclic tridiagonal -----------------------*/ - sal_uInt16 ZyklTriDiagGS(bool rep, sal_uInt16 n, double* lower, double* diag, double* upper, double* lowrow, double* ricol, double* b) /******************************/ @@ -400,10 +381,8 @@ sal_uInt16 ZyklTriDiagGS(bool rep, sal_uInt16 n, double* lower, double* diag, /*------------------ END of CYCLIC TRIDIAGONAL ---------------------*/ - } // extern "C" - /************************************************************************* |* |* NaturalSpline() @@ -507,7 +486,6 @@ sal_uInt16 NaturalSpline(sal_uInt16 n, double* x, double* y, return 0; } - /************************************************************************* |* |* PeriodicSpline() @@ -517,7 +495,6 @@ sal_uInt16 NaturalSpline(sal_uInt16 n, double* x, double* y, |* *************************************************************************/ - sal_uInt16 PeriodicSpline(sal_uInt16 n, double* x, double* y, double* b, double* c, double* d) { // array dimensions should range from [0..n]! @@ -576,8 +553,6 @@ sal_uInt16 PeriodicSpline(sal_uInt16 n, double* x, double* y, return 0; } - - /************************************************************************* |* |* ParaSpline() @@ -652,8 +627,6 @@ sal_uInt16 ParaSpline(sal_uInt16 n, double* x, double* y, sal_uInt8 MargCond, return 0; } - - /************************************************************************* |* |* CalcSpline() @@ -737,7 +710,6 @@ bool CalcSpline(Polygon& rPoly, bool Periodic, sal_uInt16& n, return bRet; } - /************************************************************************* |* |* Spline2Poly() diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx index e942e891bd19..bafcdfa4b442 100644 --- a/vcl/source/filter/sgvtext.cxx +++ b/vcl/source/filter/sgvtext.cxx @@ -36,7 +36,6 @@ extern SgfFontLst* pSgfFonts; #define abs(x) ((x)<0 ? -(x) : (x)) #endif - // Limitations: only grey shadows, 2D and with fixed distance. // Start of AbsBase.Pas @@ -124,7 +123,6 @@ extern SgfFontLst* pSgfFonts; #define MinChar 32 #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% @@ -207,7 +205,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) { @@ -356,7 +353,6 @@ UCHAR ProcessOne(UCHAR* TBuf, sal_uInt16& Index, return c; } // end of ProcessOne - UCHAR GetTextChar(UCHAR* TBuf, sal_uInt16& Index, ObjTextType& Atr0, ObjTextType& AktAtr, sal_uInt16 Rest, bool ScanEsc) @@ -407,7 +403,6 @@ UCHAR GetTextCharConv(UCHAR* TBuf, sal_uInt16& Index, return c; } - // Function GetLineFeed() // // Required line spacing in SGF-Units. ChrVPos is taken into account. @@ -1012,7 +1007,6 @@ void ObjTextType::SetFont(sal_uInt32 FontID) FontHi=sal_uInt16((FontID & 0xFFFF0000)>>16); } - // SGF.Ini lesen SgfFontOne::SgfFontOne() { diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx index ea0e32c5c32d..e518cddcb692 100644 --- a/vcl/source/filter/wmf/emfwr.cxx +++ b/vcl/source/filter/wmf/emfwr.cxx @@ -351,7 +351,6 @@ bool EMFWriter::WriteEMF( const GDIMetaFile& rMtf, FilterConfigItem* pFilterConf .WriteUInt32( (sal_uInt32)0x14 ); // nSizeLast ImplEndRecord(); - // write header const sal_uLong nEndPos = m_rStm.Tell(); m_rStm.Seek( nHeaderPos ); diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx index 6c58c94644d0..7be3492ccfb7 100644 --- a/vcl/source/filter/wmf/enhwmf.cxx +++ b/vcl/source/filter/wmf/enhwmf.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "winmtf.hxx" #include <osl/endian.h> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -154,7 +153,6 @@ using namespace std; #define EMR_SETLINKEDUFIS 119 #define EMR_SETTEXTJUSTIFICATION 120 - #ifdef OSL_BIGENDIAN // little endian <-> big endian switch static float GetSwapFloat( SvStream& rSt ) @@ -326,7 +324,6 @@ void EnhWMFReader::ReadAndDrawPolygon(Drawer drawer, const bool skipFirst) drawer(pOut, aPolygon, skipFirst, bRecordPath); } - /** * Reads polygons from the stream. * The \<class T> parameter is for the type of the points @@ -1488,7 +1485,6 @@ bool EnhWMFReader::ReadEnhWMF() return bStatus; }; - bool EnhWMFReader::ReadHeader() { sal_uInt32 nType, nSignature, nVersion; @@ -1595,7 +1591,6 @@ bool EnhWMFReader::ReadHeader() return true; } - Rectangle EnhWMFReader::ReadRectangle( sal_Int32 x1, sal_Int32 y1, sal_Int32 x2, sal_Int32 y2 ) { Point aTL ( Point( x1, y1 ) ); diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx index aca9822e685f..e7f6b200c55a 100644 --- a/vcl/source/filter/wmf/winmtf.cxx +++ b/vcl/source/filter/wmf/winmtf.cxx @@ -29,7 +29,6 @@ #include <rtl/tencinfo.h> #include <vcl/virdev.hxx> - #if OSL_DEBUG_LEVEL > 1 #define EMFP_DEBUG(x) x #else @@ -88,7 +87,6 @@ basegfx::B2DPolyPolygon WinMtfClipPath::getClipPath() const return maClip.getClipPoly(); } - void WinMtfPathObj::AddPoint( const Point& rPoint ) { if ( bClosed ) @@ -136,7 +134,6 @@ void WinMtfPathObj::ClosePath() bClosed = true; } - WinMtfFontStyle::WinMtfFontStyle( LOGFONTW& rFont ) { rtl_TextEncoding eCharSet; @@ -405,7 +402,6 @@ Point WinMtfOutput::ImplMap( const Point& rPt ) return Point(); }; - Size WinMtfOutput::ImplMap( const Size& rSz ) { if ( mnWinExtX && mnWinExtY ) @@ -465,13 +461,11 @@ Size WinMtfOutput::ImplMap( const Size& rSz ) return Size(); } - Rectangle WinMtfOutput::ImplMap( const Rectangle& rRect ) { return Rectangle( ImplMap( rRect.TopLeft() ), ImplMap( rRect.GetSize() ) ); } - void WinMtfOutput::ImplMap( Font& rFont ) { // !!! HACK: we now always set the width to zero because the OS width is interpreted differently; @@ -497,7 +491,6 @@ Polygon& WinMtfOutput::ImplMap( Polygon& rPolygon ) return rPolygon; } - Polygon& WinMtfOutput::ImplScale( Polygon& rPolygon ) { sal_uInt16 nPoints = rPolygon.GetSize(); @@ -508,7 +501,6 @@ Polygon& WinMtfOutput::ImplScale( Polygon& rPolygon ) return rPolygon; } - PolyPolygon& WinMtfOutput::ImplScale( PolyPolygon& rPolyPolygon ) { sal_uInt16 nPolys = rPolyPolygon.Count(); @@ -519,7 +511,6 @@ PolyPolygon& WinMtfOutput::ImplScale( PolyPolygon& rPolyPolygon ) return rPolyPolygon; } - PolyPolygon& WinMtfOutput::ImplMap( PolyPolygon& rPolyPolygon ) { sal_uInt16 nPolys = rPolyPolygon.Count(); @@ -527,7 +518,6 @@ PolyPolygon& WinMtfOutput::ImplMap( PolyPolygon& rPolyPolygon ) return rPolyPolygon; } - void WinMtfOutput::SelectObject( sal_Int32 nIndex ) { GDIObj* pGDIObj = NULL; @@ -619,43 +609,36 @@ void WinMtfOutput::SelectObject( sal_Int32 nIndex ) delete pGDIObj; } - const Font& WinMtfOutput::GetFont() const { return maFont; } - void WinMtfOutput::SetTextLayoutMode( const sal_uInt32 nTextLayoutMode ) { mnTextLayoutMode = nTextLayoutMode; } - void WinMtfOutput::SetBkMode( sal_uInt32 nMode ) { mnBkMode = nMode; } - void WinMtfOutput::SetBkColor( const Color& rColor ) { maBkColor = rColor; } - void WinMtfOutput::SetTextColor( const Color& rColor ) { maTextColor = rColor; } - void WinMtfOutput::SetTextAlign( sal_uInt32 nAlign ) { mnTextAlign = nAlign; } - void WinMtfOutput::ImplResizeObjectArry( sal_uInt32 nNewEntrys ) { sal_uInt32 i = vGDIObj.size(); @@ -664,7 +647,6 @@ void WinMtfOutput::ImplResizeObjectArry( sal_uInt32 nNewEntrys ) vGDIObj[ i ] = NULL; } - void WinMtfOutput::ImplDrawClippedPolyPolygon( const PolyPolygon& rPolyPoly ) { if ( rPolyPoly.Count() ) @@ -815,7 +797,6 @@ void WinMtfOutput::SetClipPath( const PolyPolygon& rPolyPolygon, sal_Int32 nClip } } - WinMtfOutput::WinMtfOutput( GDIMetaFile& rGDIMetaFile ) : mnLatestTextAlign ( 0 ), mnTextAlign ( TA_LEFT | TA_TOP | TA_NOUPDATECP ), diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index 73e78a5aa79c..62a9f2aaf3f4 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -71,7 +71,6 @@ #define DEFAULT_PALETTE 15 #define SYSTEM_FIXED_FONT 16 - #define R2_BLACK 1 #define R2_NOTMERGEPEN 2 #define R2_MASKNOTPEN 3 @@ -99,7 +98,6 @@ #define MM_ISOTROPIC 7 #define MM_ANISOTROPIC 8 - /* Graphics modes */ #define GM_COMPATIBLE 1 #define GM_ADVANCED 2 @@ -220,7 +218,6 @@ struct WMF_EXTERNALHEADER; /*_WIN32_WINNT >= 0x0500*/ #define ETO_PDY 0x2000 - #define DEFAULT_PITCH 0x00 #define FIXED_PITCH 0x01 #define VARIABLE_PITCH 0x02 @@ -394,7 +391,6 @@ struct WinMtfFillStyle } }; - struct WinMtfLineStyle { Color aLineColor; @@ -445,7 +441,6 @@ struct WinMtfLineStyle } }; - struct XForm { float eM11; @@ -461,7 +456,6 @@ struct XForm } }; - struct SaveStruct { sal_uInt32 nBkMode, nMapMode, nGfxMode, nTextLayoutMode; @@ -488,7 +482,6 @@ struct SaveStruct typedef ::boost::shared_ptr< SaveStruct > SaveStructPtr; - struct BSaveStruct { Bitmap aBmp; @@ -511,7 +504,6 @@ struct BSaveStruct typedef ::std::vector< BSaveStruct* > BSaveStructList_impl; - enum GDIObjectType { GDI_DUMMY = 0, GDI_PEN = 1, @@ -565,7 +557,6 @@ struct GDIObj } }; - class WinMtfOutput { WinMtfPathObj aPathObj; @@ -752,7 +743,6 @@ public: virtual ~WinMtfOutput(); }; - class WinMtf { protected: @@ -780,14 +770,12 @@ protected: ~WinMtf(); }; - class EnhWMFReader : public WinMtf { bool bRecordPath; sal_Int32 nRecordCount; bool bEMFPlus; - bool ReadHeader(); // reads and converts the rectangle Rectangle ReadRectangle( sal_Int32, sal_Int32, sal_Int32, sal_Int32 ); @@ -815,7 +803,6 @@ private: template <class T, class Drawer> void ReadAndDrawPolygon(Drawer drawer, const bool skipFirst); }; - class WMFReader : public WinMtf { private: diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx index 792f48492cd9..fff2f9db0285 100644 --- a/vcl/source/filter/wmf/winwmf.cxx +++ b/vcl/source/filter/wmf/winwmf.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "winmtf.hxx" #include <boost/scoped_array.hpp> #include <vcl/gdimtf.hxx> diff --git a/vcl/source/filter/wmf/wmf.cxx b/vcl/source/filter/wmf/wmf.cxx index 59e26b44a853..3efc5c9d51d8 100644 --- a/vcl/source/filter/wmf/wmf.cxx +++ b/vcl/source/filter/wmf/wmf.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "winmtf.hxx" #include "emfwr.hxx" #include "wmfwr.hxx" diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx index 62bf6ec094c6..6439b41fc2d2 100644 --- a/vcl/source/filter/wmf/wmfwr.cxx +++ b/vcl/source/filter/wmf/wmfwr.cxx @@ -179,55 +179,47 @@ void WMFWriter::CountActionsAndBitmaps( const GDIMetaFile & rMTF ) } } - void WMFWriter::WritePointXY(const Point & rPoint) { Point aPt( pVirDev->LogicToLogic(rPoint,aSrcMapMode,aTargetMapMode) ); pWMF->WriteInt16( (short)aPt.X() ).WriteInt16( (short)aPt.Y() ); } - void WMFWriter::WritePointYX(const Point & rPoint) { Point aPt( pVirDev->LogicToLogic(rPoint,aSrcMapMode,aTargetMapMode) ); pWMF->WriteInt16( (short)aPt.Y() ).WriteInt16( (short)aPt.X() ); } - sal_Int32 WMFWriter::ScaleWidth( sal_Int32 nDX ) { Size aSz( pVirDev->LogicToLogic(Size(nDX,0),aSrcMapMode,aTargetMapMode) ); return aSz.Width(); } - void WMFWriter::WriteSize(const Size & rSize) { Size aSz( pVirDev->LogicToLogic(rSize,aSrcMapMode,aTargetMapMode) ); pWMF->WriteInt16( (short)aSz.Width() ).WriteInt16( (short)aSz.Height() ); } - void WMFWriter::WriteHeightWidth(const Size & rSize) { Size aSz( pVirDev->LogicToLogic(rSize,aSrcMapMode,aTargetMapMode) ); pWMF->WriteInt16( (short)aSz.Height() ).WriteInt16( (short)aSz.Width() ); } - void WMFWriter::WriteRectangle(const Rectangle & rRect) { WritePointYX(Point(rRect.Right()+1,rRect.Bottom()+1)); WritePointYX(rRect.TopLeft()); } - void WMFWriter::WriteColor(const Color & rColor) { pWMF->WriteUChar( (sal_uInt8) rColor.GetRed() ).WriteUChar( (sal_uInt8) rColor.GetGreen() ).WriteUChar( (sal_uInt8) rColor.GetBlue() ).WriteUChar( (sal_uInt8) 0 ); } - void WMFWriter::WriteRecordHeader(sal_uInt32 nSizeWords, sal_uInt16 nType) { nActRecordPos=pWMF->Tell(); @@ -235,7 +227,6 @@ void WMFWriter::WriteRecordHeader(sal_uInt32 nSizeWords, sal_uInt16 nType) pWMF->WriteUInt32( nSizeWords ).WriteUInt16( nType ); } - void WMFWriter::UpdateRecordHeader() { sal_uLong nPos; @@ -253,7 +244,6 @@ void WMFWriter::UpdateRecordHeader() pWMF->Seek(nPos); } - void WMFWriter::WMFRecord_Arc(const Rectangle & rRect, const Point & rStartPt, const Point & rEndPt) { WriteRecordHeader(0x0000000b,W_META_ARC); @@ -270,7 +260,6 @@ void WMFWriter::WMFRecord_Chord(const Rectangle & rRect, const Point & rStartPt, WriteRectangle(rRect); } - void WMFWriter::WMFRecord_CreateBrushIndirect(const Color& rColor) { WriteRecordHeader(0x00000007,W_META_CREATEBRUSHINDIRECT); @@ -388,7 +377,6 @@ void WMFWriter::WMFRecord_DeleteObject(sal_uInt16 nObjectHandle) pWMF->WriteUInt16( nObjectHandle ); } - void WMFWriter::WMFRecord_Ellipse(const Rectangle & rRect) { WriteRecordHeader(0x00000007,W_META_ELLIPSE); @@ -619,7 +607,6 @@ void WMFWriter::WMFRecord_PolyLine(const Polygon & rPoly) for (i=0; i<nSize; i++) WritePointXY(aSimplePoly.GetPoint(i)); } - void WMFWriter::WMFRecord_PolyPolygon(const PolyPolygon & rPolyPoly) { const Polygon * pPoly; @@ -647,21 +634,18 @@ void WMFWriter::WMFRecord_PolyPolygon(const PolyPolygon & rPolyPoly) UpdateRecordHeader(); } - void WMFWriter::WMFRecord_Rectangle(const Rectangle & rRect) { WriteRecordHeader( 0x00000007,W_META_RECTANGLE ); WriteRectangle( rRect ); } - void WMFWriter::WMFRecord_RestoreDC() { WriteRecordHeader(0x00000004,W_META_RESTOREDC); pWMF->WriteInt16( (short)-1 ); } - void WMFWriter::WMFRecord_RoundRect(const Rectangle & rRect, long nHorzRound, long nVertRound) { WriteRecordHeader(0x00000009,W_META_ROUNDRECT); @@ -669,20 +653,17 @@ void WMFWriter::WMFRecord_RoundRect(const Rectangle & rRect, long nHorzRound, lo WriteRectangle(rRect); } - void WMFWriter::WMFRecord_SaveDC() { WriteRecordHeader(0x00000003,W_META_SAVEDC); } - void WMFWriter::WMFRecord_SelectObject(sal_uInt16 nObjectHandle) { WriteRecordHeader(0x00000004,W_META_SELECTOBJECT); pWMF->WriteUInt16( nObjectHandle ); } - void WMFWriter::WMFRecord_SetBkMode(bool bTransparent) { WriteRecordHeader(0x00000004,W_META_SETBKMODE); @@ -744,7 +725,6 @@ void WMFWriter::WMFRecord_SetWindowExt(const Size & rSize) WriteHeightWidth(rSize); } - void WMFWriter::WMFRecord_SetWindowOrg(const Point & rPoint) { WriteRecordHeader(0x00000005,W_META_SETWINDOWORG); @@ -774,7 +754,6 @@ void WMFWriter::WMFRecord_StretchDIB( const Point & rPoint, const Size & rSize, // write bitmap WriteDIB(rBitmap, *pWMF, false, true); - // write the parameters: nPosEnd=pWMF->Tell(); pWMF->Seek(nPosAnf); @@ -825,14 +804,12 @@ void WMFWriter::WMFRecord_EndOfFile() WriteRecordHeader(0x00000003,0x0000); } - void WMFWriter::WMFRecord_IntersectClipRect( const Rectangle& rRect ) { WriteRecordHeader( 0x00000007, W_META_INTERSECTCLIPRECT ); WriteRectangle(rRect); } - sal_uInt16 WMFWriter::AllocHandle() { sal_uInt16 i; @@ -847,13 +824,11 @@ sal_uInt16 WMFWriter::AllocHandle() return 0xffff; } - void WMFWriter::FreeHandle(sal_uInt16 nObjectHandle) { if (nObjectHandle<MAXOBJECTHANDLES) bHandleAllocated[nObjectHandle]=false; } - void WMFWriter::CreateSelectDeletePen( const Color& rColor, const LineInfo& rLineInfo ) { sal_uInt16 nOldHandle; @@ -868,7 +843,6 @@ void WMFWriter::CreateSelectDeletePen( const Color& rColor, const LineInfo& rLin } } - void WMFWriter::CreateSelectDeleteFont(const Font & rFont) { sal_uInt16 nOldHandle; @@ -883,7 +857,6 @@ void WMFWriter::CreateSelectDeleteFont(const Font & rFont) } } - void WMFWriter::CreateSelectDeleteBrush(const Color& rColor) { sal_uInt16 nOldHandle; @@ -898,7 +871,6 @@ void WMFWriter::CreateSelectDeleteBrush(const Color& rColor) } } - void WMFWriter::SetLineAndFillAttr() { if ( eDstROP2 != eSrcRasterOp ) @@ -957,7 +929,6 @@ void WMFWriter::SetAllAttr() } } - void WMFWriter::HandleLineInfoPolyPolygons(const LineInfo& rInfo, const basegfx::B2DPolygon& rLinePolygon) { if(rLinePolygon.count()) @@ -1103,7 +1074,6 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF ) } break; - case META_CHORD_ACTION: { const MetaChordAction* pA = (const MetaChordAction*) pMA; @@ -1670,7 +1640,6 @@ void WMFWriter::WriteHeader( const GDIMetaFile &, bool bPlaceable ) .WriteUInt16( (sal_uInt16)0x0000 ); // reserved } - void WMFWriter::UpdateHeader() { sal_uLong nPos; @@ -1691,7 +1660,6 @@ void WMFWriter::UpdateHeader() pWMF->Seek(nPos); } - bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream, FilterConfigItem* pFConfigItem, bool bPlaceable ) { @@ -1816,7 +1784,6 @@ bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream, return bStatus; } - sal_uInt16 WMFWriter::CalcSaveTargetMapMode(MapMode& rMapMode, const Size& rPrefSize) { diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx index 5e82cafb14cf..e195065f01a4 100644 --- a/vcl/source/font/PhysicalFontCollection.cxx +++ b/vcl/source/font/PhysicalFontCollection.cxx @@ -102,7 +102,6 @@ static unsigned lcl_IsCJKFont( const OUString& rFontName ) return 0; } - PhysicalFontCollection::PhysicalFontCollection() : mbMatchData( false ) , mbMapNames( false ) diff --git a/vcl/source/font/PhysicalFontFace.cxx b/vcl/source/font/PhysicalFontFace.cxx index c454d3d09970..b79969b498fd 100644 --- a/vcl/source/font/PhysicalFontFace.cxx +++ b/vcl/source/font/PhysicalFontFace.cxx @@ -25,7 +25,6 @@ #include "PhysicalFontFace.hxx" - PhysicalFontFace::PhysicalFontFace( const ImplDevFontAttributes& rDFA, int nMagic ) : ImplDevFontAttributes( rDFA ) , mnWidth(0) diff --git a/vcl/source/font/PhysicalFontFamily.cxx b/vcl/source/font/PhysicalFontFamily.cxx index f0f33071b1b3..a98a60df1114 100644 --- a/vcl/source/font/PhysicalFontFamily.cxx +++ b/vcl/source/font/PhysicalFontFamily.cxx @@ -89,7 +89,6 @@ static unsigned lcl_IsCJKFont( const OUString& rFontName ) return 0; } - PhysicalFontFamily::PhysicalFontFamily( const OUString& rSearchName ) : mpFirst( NULL ), maSearchName( rSearchName ), @@ -294,5 +293,4 @@ void PhysicalFontFamily::UpdateCloneFontList( PhysicalFontCollection& rFontColle } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index 83f68152e798..8880095fb7cc 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <cstdio> #include <cstring> #include <assert.h> @@ -256,7 +255,6 @@ struct TYPE2OP }; }; - struct CffGlobal { explicit CffGlobal(); @@ -285,7 +283,6 @@ struct CffGlobal int mnFamilyNameSID; }; - struct CffLocal { explicit CffLocal(); @@ -317,7 +314,6 @@ struct CffLocal bool mbForceBold; }; - class SubsetterContext { public: @@ -327,12 +323,9 @@ public: GlyphWidth* pGlyphWidths, int nGlyphCount, FontSubsetInfo& ) = 0; }; - - SubsetterContext::~SubsetterContext( void) {} - class CffSubsetterContext : public SubsetterContext , private CffGlobal @@ -439,8 +432,6 @@ private: ValType maCharWidth; }; - - CffSubsetterContext::CffSubsetterContext( const U8* pBasePtr, int nBaseLen) : mpBasePtr( pBasePtr) , mpBaseEnd( pBasePtr+nBaseLen) @@ -454,15 +445,11 @@ CffSubsetterContext::CffSubsetterContext( const U8* pBasePtr, int nBaseLen) mpCffLocal = &maCffLocal[0]; } - - CffSubsetterContext::~CffSubsetterContext( void) { // TODO: delete[] maCffLocal; } - - inline int CffSubsetterContext::popInt( void) { const ValType aVal = popVal(); @@ -471,8 +458,6 @@ inline int CffSubsetterContext::popInt( void) return nInt; } - - inline int CffSubsetterContext::peekInt( void) const { const ValType aVal = peekVal(); @@ -481,8 +466,6 @@ inline int CffSubsetterContext::peekInt( void) const return nInt; } - - inline int CffSubsetterContext::getInt( int nIndex) const { const ValType aVal = getVal( nIndex); @@ -491,8 +474,6 @@ inline int CffSubsetterContext::getInt( int nIndex) const return nInt; } - - inline void CffSubsetterContext::updateWidth( bool bUseFirstVal) { #if 1 // TODO: is this still needed? @@ -511,8 +492,6 @@ inline void CffSubsetterContext::updateWidth( bool bUseFirstVal) } } - - void CffSubsetterContext::addHints( bool bVerticalHints) { // the first charstring value may a charwidth instead of a charwidth @@ -1456,7 +1435,6 @@ void CffSubsetterContext::seekIndexEnd( int nIndexBase) assert( mpReadEnd <= mpBaseEnd); } - // initialize FONTDICT specific values CffLocal::CffLocal( void) : mnPrivDictBase( 0) diff --git a/vcl/source/fontsubset/fontsubset.cxx b/vcl/source/fontsubset/fontsubset.cxx index 0f11ef7d251d..3be409923c83 100644 --- a/vcl/source/fontsubset/fontsubset.cxx +++ b/vcl/source/fontsubset/fontsubset.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/debug.hxx> #include <fontsubset.hxx> diff --git a/vcl/source/fontsubset/gsub.cxx b/vcl/source/fontsubset/gsub.cxx index 3d5c5d146643..147cba7d735a 100644 --- a/vcl/source/fontsubset/gsub.cxx +++ b/vcl/source/fontsubset/gsub.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "sft.hxx" #include "gsub.h" @@ -36,7 +35,6 @@ typedef sal_uInt8 FT_Byte; typedef std::map<sal_uInt16,sal_uInt16> GlyphSubstitution; - inline sal_uInt32 NEXT_Long( const unsigned char* &p ) { sal_uInt32 nVal = (p[0]<<24) + (p[1]<<16) + (p[2]<<8) + p[3]; diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index d95715903086..438876e0adfd 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - /* * Sun Font Tools * @@ -208,7 +207,6 @@ _inline sal_uInt32 GetUInt32(const sal_uInt8 *ptr, size_t offset, int bigendian) sal_uInt32 t; assert(ptr != 0); - if (bigendian) { t = (ptr+offset)[0] << 24 | (ptr+offset)[1] << 16 | (ptr+offset)[2] << 8 | (ptr+offset)[3]; @@ -258,7 +256,6 @@ _inline F16Dot16 fixedMul(F16Dot16 a, F16Dot16 b) return sign ? -res : res; } - _inline F16Dot16 fixedDiv(F16Dot16 a, F16Dot16 b) { unsigned int f, r; @@ -375,8 +372,6 @@ static void HexFmtBlockWrite(HexFmt *_this, const void *ptr, sal_uInt32 size) } #endif - - /* Outline Extraction functions */ /* fills the aw and lsb entries of the TTGlyphMetrics structure from hmtx table -*/ @@ -812,7 +807,6 @@ static int BSplineToPSPath(ControlPoint *srcA, int srcCount, PSPathElement **pat continue; } - if (cp == EndContour) { cp = StartContour; ecflag = true; @@ -1148,7 +1142,6 @@ static sal_uInt16 GEbinsearch(sal_uInt16 *ar, sal_uInt16 length, sal_uInt16 toSe return (sal_uInt16)lastfound; } - static sal_uInt32 getGlyph4(const sal_uInt8 *cmap, sal_uInt32 c) { sal_uInt16 i; int ToReturn; @@ -1216,7 +1209,6 @@ static sal_uInt32 getGlyph12(const sal_uInt8 *pCmap, sal_uInt32 cChar) { return MISSING_GLYPH_INDEX; } - static void FindCmap(TrueTypeFont *ttf) { const sal_uInt8* table = getTable(ttf, O_cmap); @@ -1791,7 +1783,6 @@ int CreateT3FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, const char *fname, const char *h41 = "(%s) cvn exch definefont pop\n"; - if (!((nGlyphs > 0) && (nGlyphs <= 256))) return SF_GLYPHNUM; if (!glyphArray) return SF_BADARG; if (!fname) fname = ttf->psname; @@ -1967,7 +1958,6 @@ int CreateTTFromTTGlyphs(TrueTypeFont *ttf, GetUInt16(p, 46, 1), GetInt16(p, 48, 1)); - /** glyf **/ glyf = TrueTypeTableNew_glyf(); @@ -2034,7 +2024,6 @@ int CreateTTFromTTGlyphs(TrueTypeFont *ttf, } #endif - #ifndef NO_TYPE42 static GlyphOffsets *GlyphOffsetsNew(sal_uInt8 *sfntP) { @@ -2235,7 +2224,6 @@ int CreateT42FromTTGlyphs(TrueTypeFont *ttf, } #endif - #ifndef NO_MAPPERS int MapString(TrueTypeFont *ttf, sal_uInt16 *str, int nchars, sal_uInt16 *glyphArray, bool bvertical) { diff --git a/vcl/source/fontsubset/ttcr.cxx b/vcl/source/fontsubset/ttcr.cxx index 3dca37ce8f6e..fdc7d1518619 100644 --- a/vcl/source/fontsubset/ttcr.cxx +++ b/vcl/source/fontsubset/ttcr.cxx @@ -35,7 +35,6 @@ #include "list.h" #include "string.h" - namespace vcl { @@ -169,7 +168,6 @@ static int NameRecordCompareF(const void *l, const void *r) return 0; } - static sal_uInt32 CheckSum(sal_uInt32 *ptr, sal_uInt32 length) { sal_uInt32 sum = 0; @@ -259,7 +257,6 @@ int StreamToMemory(TrueTypeCreator *_this, sal_uInt8 **ptr, sal_uInt32 *length) n = listCount(_this->tables); numTables = (sal_uInt16) n; - TableEntry* te = (TableEntry*)scalloc(n, sizeof(TableEntry)); listToFirst(_this->tables); @@ -348,8 +345,6 @@ int StreamToFile(TrueTypeCreator *_this, const char* fname) return r; } - - /* * TrueTypeTable private methods */ @@ -358,8 +353,6 @@ int StreamToFile(TrueTypeCreator *_this, const char* fname) #define TABLESIZE_hhea 36 #define TABLESIZE_maxp 32 - - /* Table data points to * -------------------------------------------- * generic tdata_generic struct @@ -373,7 +366,6 @@ int StreamToFile(TrueTypeCreator *_this, const char* fname) * */ - #define CMAP_SUBTABLE_INIT 10 #define CMAP_SUBTABLE_INCR 10 #define CMAP_PAIR_INIT 500 @@ -413,7 +405,6 @@ typedef struct { void *ptr; /* format-specific pointer */ } tdata_post; - /* allocate memory for a TT table */ static sal_uInt8 *ttmalloc(sal_uInt32 nbytes) { @@ -568,7 +559,6 @@ static int GetRawData_generic(TrueTypeTable *_this, sal_uInt8 **ptr, sal_uInt32 return TTCR_OK; } - static int GetRawData_head(TrueTypeTable *_this, sal_uInt8 **ptr, sal_uInt32 *len, sal_uInt32 *tag) { *len = TABLESIZE_head; @@ -701,8 +691,6 @@ static sal_uInt8 *PackCmapType6(CmapSubTable *s, sal_uInt32 *length) return ptr; } - - /* XXX it only handles Format 0 encoding tables */ static sal_uInt8 *PackCmap(CmapSubTable *s, sal_uInt32 *length) { @@ -762,7 +750,6 @@ static int GetRawData_cmap(TrueTypeTable *_this, sal_uInt8 **ptr, sal_uInt32 *le return TTCR_OK; } - static int GetRawData_name(TrueTypeTable *_this, sal_uInt8 **ptr, sal_uInt32 *len, sal_uInt32 *tag) { list l; @@ -862,10 +849,6 @@ static int GetRawData_post(TrueTypeTable *_this, sal_uInt8 **ptr, sal_uInt32 *le return ret; } - - - - static struct { sal_uInt32 tag; int (*f)(TrueTypeTable *, sal_uInt8 **, sal_uInt32 *, sal_uInt32 *); @@ -881,7 +864,6 @@ static struct { {T_name, GetRawData_name}, {T_post, GetRawData_post} - }; /* @@ -934,7 +916,6 @@ TrueTypeTable *TrueTypeTableNew_head(sal_uInt32 fontRevision, TrueTypeTable* table = (TrueTypeTable*)smalloc(sizeof(TrueTypeTable)); sal_uInt8* ptr = (sal_uInt8*)ttmalloc(TABLESIZE_head); - PutUInt32(0x00010000, ptr, 0, 1); /* version */ PutUInt32(fontRevision, ptr, 4, 1); PutUInt32(0x5F0F3CF5, ptr, 12, 1); /* magic number */ @@ -1272,7 +1253,6 @@ sal_uInt32 glyfCount(const TrueTypeTable *table) return listCount((list) table->data); } - void nameAdd(TrueTypeTable *table, NameRecord *nr) { list l; @@ -1348,7 +1328,6 @@ static void ProcessTables(TrueTypeCreator *tt) glyfLen += gd->nbytes; /* XXX if (gd->nbytes & 1) glyfLen++; */ - assert(gd->newID == i); gid[i++] = gd->glyphID; /* gd->glyphID = i++; */ @@ -1524,7 +1503,6 @@ extern "C" free(_this); } - /** * Destructor for the TrueTypeTable object. */ @@ -1547,7 +1525,6 @@ extern "C" } } - #ifdef TEST_TTCR _inline sal_uInt32 mkTag(sal_uInt8 a, sal_uInt8 b, sal_uInt8 c, sal_uInt8 d) { return (a << 24) | (b << 16) | (c << 8) | d; @@ -1584,7 +1561,6 @@ int main(void) free(t6); free(t7); - StreamToFile(ttcr, "ttcrout.ttf"); TrueTypeCreatorDispose(ttcr); diff --git a/vcl/source/fontsubset/ttcr.hxx b/vcl/source/fontsubset/ttcr.hxx index bb94faae1081..e2ee3c4e0cec 100644 --- a/vcl/source/fontsubset/ttcr.hxx +++ b/vcl/source/fontsubset/ttcr.hxx @@ -79,7 +79,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 @@ -94,7 +93,6 @@ namespace vcl */ int StreamToFile(TrueTypeCreator *_this, const char* fname); - /** * 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. @@ -184,7 +182,6 @@ namespace vcl sal_Int16 underlineThickness, sal_uInt32 isFixedPitch); - // Table manipulation functions /** @@ -217,7 +214,6 @@ namespace vcl } // namespace - extern "C" { /** diff --git a/vcl/source/fontsubset/xlat.hxx b/vcl/source/fontsubset/xlat.hxx index 2eb67832aeb5..62317c0d925b 100644 --- a/vcl/source/fontsubset/xlat.hxx +++ b/vcl/source/fontsubset/xlat.hxx @@ -19,7 +19,6 @@ /*| Author: Alexander Gelfenbain |*/ - #ifndef INCLUDED_VCL_SOURCE_FONTSUBSET_XLAT_HXX #define INCLUDED_VCL_SOURCE_FONTSUBSET_XLAT_HXX diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index abc068958353..6236b0c55f53 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/animate.hxx> #include <tools/debug.hxx> #include <tools/stream.hxx> @@ -27,7 +26,6 @@ #include <impanmvw.hxx> #include <vcl/dibtools.hxx> - #define MIN_TIMEOUT 2L #define INC_TIMEOUT 0L @@ -301,7 +299,6 @@ void Animation::Stop( OutputDevice* pOut, long nExtraData ) for( size_t i = 0; i < maViewList.size(); ) { - ImplAnimView* pView = maViewList[ i ]; if( pView->ImplMatches( pOut, nExtraData ) ) { diff --git a/vcl/source/gdi/base14.cxx b/vcl/source/gdi/base14.cxx index 52e99a5e262b..1e3dda522817 100644 --- a/vcl/source/gdi/base14.cxx +++ b/vcl/source/gdi/base14.cxx @@ -17,14 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "pdfwriter_impl.hxx" #include <rtl/strbuf.hxx> #include <vcl/settings.hxx> using namespace vcl; - OString PDFWriterImpl::BuiltinFont::getNameObject() const { OStringBuffer aBuf( 16 ); diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index eed59885bca0..51221ee5873f 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -946,8 +946,6 @@ bool Bitmap::Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nSc return bRetval; } - - bool Bitmap::Scale( const Size& rNewSize, sal_uInt32 nScaleFlag ) { const Size aSize( GetSizePixel() ); @@ -965,15 +963,11 @@ bool Bitmap::Scale( const Size& rNewSize, sal_uInt32 nScaleFlag ) return bRet; } - - void Bitmap::AdaptBitCount(Bitmap& rNew) const { ImplAdaptBitCount(rNew); } - - void Bitmap::ImplAdaptBitCount(Bitmap& rNew) const { // aNew is the result of some operation; adapt it's BitCount to the original (this) @@ -2076,8 +2070,6 @@ bool Bitmap::ImplScaleSuper( return bRet; } - - namespace { void ImplCalculateContributions( @@ -2434,8 +2426,6 @@ bool Bitmap::ImplScaleConvolution( return bResult; } - - bool Bitmap::Dither( sal_uLong nDitherFlags ) { bool bRet = false; diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx index 642d2010342e..f8c987edb0fc 100644 --- a/vcl/source/gdi/bitmap4.cxx +++ b/vcl/source/gdi/bitmap4.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdlib.h> #include <vcl/bmpacc.hxx> #include <vcl/bitmap.hxx> @@ -1175,7 +1174,6 @@ bool Bitmap::ImplSeparableUnsharpenFilter(const double radius) { return true; } - bool Bitmap::ImplDuotoneFilter( const sal_uLong nColorOne, const sal_uLong nColorTwo ) { const long nWidth = GetSizePixel().Width(); diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index 8eb46131c23f..0e41be103957 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -323,8 +323,6 @@ sal_uLong BitmapEx::GetChecksum() const return nCrc; } - - void BitmapEx::SetSizePixel( const Size& rNewSize, sal_uInt32 nScaleFlag ) { if(GetSizePixel() != rNewSize) @@ -363,8 +361,6 @@ bool BitmapEx::Mirror( sal_uLong nMirrorFlags ) return bRet; } - - bool BitmapEx::Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) { bool bRet = false; @@ -387,8 +383,6 @@ bool BitmapEx::Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 n return bRet; } - - bool BitmapEx::Scale( const Size& rNewSize, sal_uInt32 nScaleFlag ) { bool bRet; @@ -828,8 +822,6 @@ bool BitmapEx::Create( const ::com::sun::star::uno::Reference< return false; } - - namespace { Bitmap impTransformBitmap( @@ -921,8 +913,6 @@ BitmapEx BitmapEx::TransformBitmapEx( return BitmapEx(aDestination); } - - BitmapEx BitmapEx::getTransformed( const basegfx::B2DHomMatrix& rTransformation, const basegfx::B2DRange& rVisibleRange, @@ -1005,8 +995,6 @@ BitmapEx BitmapEx::getTransformed( return aRetval; } - - BitmapEx BitmapEx::ModifyBitmapEx(const basegfx::BColorModifierStack& rBColorModifierStack) const { Bitmap aChangedBitmap(GetBitmap()); @@ -1160,8 +1148,6 @@ BitmapEx BitmapEx::ModifyBitmapEx(const basegfx::BColorModifierStack& rBColorMod } } - - BitmapEx VCL_DLLPUBLIC createBlendFrame( const Size& rSize, sal_uInt8 nAlpha, diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx index 92160da2b990..134764b242f1 100644 --- a/vcl/source/gdi/bmpacc.cxx +++ b/vcl/source/gdi/bmpacc.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/salbtype.hxx> #include <vcl/bitmap.hxx> #include <vcl/bmpacc.hxx> @@ -414,7 +413,6 @@ void BitmapWriteAccess::CopyScanline( long nY, const BitmapReadAccess& rReadAcc SetPixel( nY, nX, rReadAcc.GetPixel( nY, nX ) ); } - void BitmapWriteAccess::CopyScanline( long nY, ConstScanline aSrcScanline, sal_uLong nSrcScanlineFormat, sal_uLong nSrcScanlineSize ) { diff --git a/vcl/source/gdi/bmpacc3.cxx b/vcl/source/gdi/bmpacc3.cxx index 791a75d9329d..65658d07a7eb 100644 --- a/vcl/source/gdi/bmpacc3.cxx +++ b/vcl/source/gdi/bmpacc3.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/poly.hxx> #include <vcl/salbtype.hxx> diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx index 949e21af0c16..3c668b02c445 100644 --- a/vcl/source/gdi/bmpfast.cxx +++ b/vcl/source/gdi/bmpfast.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <bmpfast.hxx> #include <tools/debug.hxx> #include <vcl/bmpacc.hxx> diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx index 796036224427..72b11592029d 100644 --- a/vcl/source/gdi/configsettings.cxx +++ b/vcl/source/gdi/configsettings.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/configsettings.hxx> #include <svdata.hxx> @@ -33,7 +32,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::container; - #define SETTINGS_CONFIGNODE "VCL/Settings" SettingsConfigItem* SettingsConfigItem::get() diff --git a/vcl/source/gdi/cvtgrf.cxx b/vcl/source/gdi/cvtgrf.cxx index 02ca28869cd1..65cc9193292b 100644 --- a/vcl/source/gdi/cvtgrf.cxx +++ b/vcl/source/gdi/cvtgrf.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/metaact.hxx> #include <vcl/cvtgrf.hxx> diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index 5d71a46ffe7f..d6f1e4d297f4 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -32,7 +32,6 @@ #define DIBINFOHEADERSIZE ( sizeof(DIBInfoHeader) ) #define DIBV5HEADERSIZE ( sizeof(DIBV5Header) ) - // - Compression defines #define COMPRESS_OWN ('S'|('D'<<8UL)) @@ -42,7 +41,6 @@ #define BITFIELDS ( 3UL ) #define ZCOMPRESS ( COMPRESS_OWN | 0x01000000UL ) /* == 'SD01' (binary) */ - // - DIBInfoHeader and DIBV5Header typedef sal_Int32 FXPT2DOT30; @@ -148,8 +146,6 @@ struct DIBV5Header : public DIBInfoHeader {} }; - - namespace { inline sal_uInt16 discretizeBitcount( sal_uInt16 nInputCount ) @@ -165,8 +161,6 @@ namespace } } - - bool ImplReadDIBInfoHeader(SvStream& rIStm, DIBV5Header& rHeader, bool& bTopDown) { // BITMAPINFOHEADER or BITMAPCOREHEADER or BITMAPV5HEADER @@ -1329,8 +1323,6 @@ bool ImplWriteDIBFileHeader(SvStream& rOStm, BitmapReadAccess& rAcc, bool bUseDI return( rOStm.GetError() == 0UL ); } - - bool ImplReadDIB( Bitmap& rTarget, Bitmap* pTargetAlpha, @@ -1438,8 +1430,6 @@ bool ImplWriteDIB( return bRet; } - - bool ReadDIB( Bitmap& rTarget, SvStream& rIStm, @@ -1536,8 +1526,6 @@ bool ReadDIBV5( return ImplReadDIB(rTarget, &rTargetAlpha, rIStm, true); } - - bool WriteDIB( const Bitmap& rSource, SvStream& rOStm, diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index b20286959b9c..489304e7cb9a 100644 --- a/vcl/source/gdi/font.cxx +++ b/vcl/source/gdi/font.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "unotools/fontcfg.hxx" #include "tools/stream.hxx" @@ -37,7 +36,6 @@ using namespace vcl; - Impl_Font::Impl_Font() : maColor( COL_TRANSPARENT ), maFillColor( COL_TRANSPARENT ), @@ -614,7 +612,6 @@ void Font::Merge( const Font& rFont ) if ( rFont.mpImplFont->meWidthType != WIDTH_DONTKNOW ) SetWidthType( rFont.GetWidthType() ); - if ( rFont.GetSize().Height() ) SetSize( rFont.GetSize() ); if ( rFont.GetUnderline() != UNDERLINE_DONTKNOW ) diff --git a/vcl/source/gdi/gdimetafiletools.cxx b/vcl/source/gdi/gdimetafiletools.cxx index e090a7d6f503..04d52cb036c8 100644 --- a/vcl/source/gdi/gdimetafiletools.cxx +++ b/vcl/source/gdi/gdimetafiletools.cxx @@ -27,7 +27,6 @@ #include <vcl/svapp.hxx> #include <vcl/graphictools.hxx> - // helpers namespace @@ -256,7 +255,6 @@ namespace } } // end of anonymous namespace - // #i121267# Tooling to internally clip geometry against internal clip regions void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) @@ -480,7 +478,6 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) break; } - // geometry actions case META_LINE_ACTION : @@ -706,7 +703,6 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) break; } - // bitmap actions, create BitmapEx with alpha channel derived // from clipping @@ -858,7 +854,6 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) break; } - // need to handle all those 'hacks' which hide data in comments case META_COMMENT_ACTION : @@ -964,10 +959,8 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) break; } - // need to handle gradient fills (hopefully only unroated ones) - case META_GRADIENT_ACTION : { const MetaGradientAction* pA = static_cast< const MetaGradientAction* >(pAction); @@ -990,7 +983,6 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) aTarget); } - break; } @@ -1065,8 +1057,6 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) } } - - bool VCL_DLLPUBLIC usesClipActions(const GDIMetaFile& rSource) { const sal_uLong nObjCount(rSource.GetActionSize()); diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 5698066e8ce2..797f14a9ef9b 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -2765,7 +2765,6 @@ SvStream& ReadGDIMetaFile( SvStream& rIStm, GDIMetaFile& rGDIMetaFile ) { pAction = MetaAction::ReadMetaAction( rIStm, &aReadData ); - if( pAction ) { if (pAction->GetType() == META_COMMENT_ACTION) diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index 3d6ba2951f19..2a6f8c88f2c4 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <osl/file.h> #include <tools/vcompat.hxx> #include <tools/debug.hxx> diff --git a/vcl/source/gdi/gradient.cxx b/vcl/source/gdi/gradient.cxx index d8eed8320a27..6b40529d8506 100644 --- a/vcl/source/gdi/gradient.cxx +++ b/vcl/source/gdi/gradient.cxx @@ -23,7 +23,6 @@ #include <tools/gen.hxx> #include <vcl/gradient.hxx> - Impl_Gradient::Impl_Gradient() : maStartColor( COL_BLACK ), maEndColor( COL_WHITE ) diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx index 447ad966b948..7c913abc1d32 100644 --- a/vcl/source/gdi/graphictools.cxx +++ b/vcl/source/gdi/graphictools.cxx @@ -121,7 +121,6 @@ void SvtGraphicStroke::setEndArrow( const PolyPolygon& rPoly ) maEndArrow = rPoly; } - void SvtGraphicStroke::scale( double fXScale, double fYScale ) { // Clearly scaling stroke-width for fat lines is rather a problem diff --git a/vcl/source/gdi/hatch.cxx b/vcl/source/gdi/hatch.cxx index e4d08e08a7f3..c1d0551accf9 100644 --- a/vcl/source/gdi/hatch.cxx +++ b/vcl/source/gdi/hatch.cxx @@ -22,7 +22,6 @@ #include <tools/debug.hxx> #include <vcl/hatch.hxx> - ImplHatch::ImplHatch() : mnRefCount ( 1 ), maColor ( COL_BLACK ), diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx index 77dd01ee1fdb..163e8ef0e991 100644 --- a/vcl/source/gdi/image.cxx +++ b/vcl/source/gdi/image.cxx @@ -20,7 +20,6 @@ #include <boost/scoped_ptr.hpp> #include <boost/scoped_array.hpp> - #include <osl/file.hxx> #include <tools/debug.hxx> #include <tools/stream.hxx> @@ -41,7 +40,6 @@ #include <rtl/strbuf.hxx> #endif - using namespace ::com::sun::star; Image::Image() : @@ -293,7 +291,6 @@ ImageList::ImageList( const ResId& rResId ) : { SAL_INFO( "vcl.gdi", "vcl: ImageList::ImageList( const ResId& rResId )" ); - rResId.SetRT( RSC_IMAGELIST ); ResMgr* pResMgr = rResId.GetResMgr(); @@ -342,7 +339,6 @@ ImageList::ImageList( const ::std::vector< OUString >& rNameVector, { SAL_INFO( "vcl.gdi", "vcl: ImageList::ImageList(const vector< OUString >& ..." ); - ImplInit( sal::static_int_cast< sal_uInt16 >( rNameVector.size() ), Size() ); mpImplData->maPrefix = rPrefix; @@ -642,7 +638,6 @@ void ImageList::GetImageNames( ::std::vector< OUString >& rNames ) const { SAL_INFO( "vcl.gdi", "vcl: ImageList::GetImageNames" ); - rNames = ::std::vector< OUString >(); if( mpImplData ) diff --git a/vcl/source/gdi/imagerepository.cxx b/vcl/source/gdi/imagerepository.cxx index f83981ecd22e..66398d972328 100644 --- a/vcl/source/gdi/imagerepository.cxx +++ b/vcl/source/gdi/imagerepository.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/bitmapex.hxx> #include <vcl/imagerepository.hxx> #include <vcl/settings.hxx> diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx index ee34d1fdeefd..394bdd2d0a88 100644 --- a/vcl/source/gdi/impanmvw.cxx +++ b/vcl/source/gdi/impanmvw.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "impanmvw.hxx" #include <vcl/virdev.hxx> #include <vcl/window.hxx> diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx index 08ecc18b7a91..005a45e6e9aa 100644 --- a/vcl/source/gdi/impbmp.cxx +++ b/vcl/source/gdi/impbmp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/bitmap.hxx> #include <svdata.hxx> diff --git a/vcl/source/gdi/impfont.cxx b/vcl/source/gdi/impfont.cxx index e341c813b4a9..31d796855733 100644 --- a/vcl/source/gdi/impfont.cxx +++ b/vcl/source/gdi/impfont.cxx @@ -22,8 +22,6 @@ #include <vector> #include <set> - - CmapResult::CmapResult( bool bSymbolic, const sal_UCS4* pRangeCodes, int nRangeCount, const int* pStartGlyphs, const sal_uInt16* pExtraGlyphIds ) @@ -35,8 +33,6 @@ CmapResult::CmapResult( bool bSymbolic, , mbRecoded( false) {} - - ImplFontCharMap::ImplFontCharMap( const CmapResult& rCR ) : mpRangeCodes( rCR.mpRangeCodes ) , mpStartGlyphs( rCR.mpStartGlyphs ) @@ -58,16 +54,12 @@ static ImplFontCharMap* pDefaultImplFontCharMap = NULL; static const sal_UCS4 aDefaultUnicodeRanges[] = {0x0020,0xD800, 0xE000,0xFFF0}; static const sal_UCS4 aDefaultSymbolRanges[] = {0x0020,0x0100, 0xF020,0xF100}; - - bool ImplFontCharMap::IsDefaultMap() const { const bool bIsDefault = (mpRangeCodes == aDefaultUnicodeRanges) || (mpRangeCodes == aDefaultSymbolRanges); return bIsDefault; } - - ImplFontCharMap::~ImplFontCharMap() { if( IsDefaultMap() ) @@ -77,8 +69,6 @@ ImplFontCharMap::~ImplFontCharMap() delete[] mpGlyphIds; } - - ImplFontCharMap* ImplFontCharMap::GetDefaultMap( bool bSymbols) { if( pDefaultImplFontCharMap ) @@ -100,15 +90,11 @@ ImplFontCharMap* ImplFontCharMap::GetDefaultMap( bool bSymbols) return pDefaultImplFontCharMap; } - - void ImplFontCharMap::AddReference( void) const { ++mnRefCount; } - - void ImplFontCharMap::DeReference( void) const { if( --mnRefCount <= 0 ) @@ -116,15 +102,11 @@ void ImplFontCharMap::DeReference( void) const delete this; } - - int ImplFontCharMap::GetCharCount() const { return mnCharCount; } - - int ImplFontCharMap::ImplFindRangeIndex( sal_UCS4 cChar ) const { int nLower = 0; @@ -142,8 +124,6 @@ int ImplFontCharMap::ImplFindRangeIndex( sal_UCS4 cChar ) const return nMid; } - - bool ImplFontCharMap::HasChar( sal_UCS4 cChar ) const { bool bHasChar = false; @@ -161,8 +141,6 @@ bool ImplFontCharMap::HasChar( sal_UCS4 cChar ) const return bHasChar; } - - int ImplFontCharMap::GetGlyphIndex( sal_UCS4 cChar ) const { // return -1 if the object doesn't know the glyph ids @@ -198,8 +176,6 @@ int ImplFontCharMap::GetGlyphIndex( sal_UCS4 cChar ) const return nGlyphIndex; } - - // returns the number of chars supported by the font, which // are inside the unicode range from cMin to cMax (inclusive) int ImplFontCharMap::CountCharsInRange( sal_UCS4 cMin, sal_UCS4 cMax ) const @@ -227,22 +203,16 @@ int ImplFontCharMap::CountCharsInRange( sal_UCS4 cMin, sal_UCS4 cMax ) const return nCount; } - - sal_UCS4 ImplFontCharMap::GetFirstChar() const { return mpRangeCodes[0]; } - - sal_UCS4 ImplFontCharMap::GetLastChar() const { return (mpRangeCodes[ 2*mnRangeCount-1 ] - 1); } - - sal_UCS4 ImplFontCharMap::GetNextChar( sal_UCS4 cChar ) const { if( cChar < GetFirstChar() ) @@ -256,8 +226,6 @@ sal_UCS4 ImplFontCharMap::GetNextChar( sal_UCS4 cChar ) const return (cChar + 1); } - - sal_UCS4 ImplFontCharMap::GetPrevChar( sal_UCS4 cChar ) const { if( cChar <= GetFirstChar() ) @@ -271,8 +239,6 @@ sal_UCS4 ImplFontCharMap::GetPrevChar( sal_UCS4 cChar ) const return (cChar - 1); } - - int ImplFontCharMap::GetIndexFromChar( sal_UCS4 cChar ) const { // TODO: improve linear walk? @@ -293,8 +259,6 @@ int ImplFontCharMap::GetIndexFromChar( sal_UCS4 cChar ) const return -1; } - - sal_UCS4 ImplFontCharMap::GetCharFromIndex( int nCharIndex ) const { // TODO: improve linear walk? @@ -312,8 +276,6 @@ sal_UCS4 ImplFontCharMap::GetCharFromIndex( int nCharIndex ) const return mpRangeCodes[0]; } - - static unsigned GetUInt( const unsigned char* p ) { return((p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]);} static unsigned Getsal_uInt16( const unsigned char* p ){ return((p[0]<<8) | p[1]);} static int GetSShort( const unsigned char* p ){ return((static_cast<signed char>(p[0])<<8)|p[1]);} @@ -602,36 +564,26 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, CmapResult& rResult ) return true; } - - FontCharMap::FontCharMap() : mpImpl( ImplFontCharMap::GetDefaultMap() ) {} - - FontCharMap::~FontCharMap() { mpImpl->DeReference(); mpImpl = NULL; } - - int FontCharMap::GetCharCount() const { return mpImpl->GetCharCount(); } - - int FontCharMap::CountCharsInRange( sal_UCS4 cMin, sal_UCS4 cMax ) const { return mpImpl->CountCharsInRange( cMin, cMax ); } - - void FontCharMap::Reset( const ImplFontCharMap* pNewMap ) { if( pNewMap == NULL ) @@ -647,57 +599,41 @@ void FontCharMap::Reset( const ImplFontCharMap* pNewMap ) } } - - bool FontCharMap::IsDefaultMap() const { return mpImpl->IsDefaultMap(); } - - bool FontCharMap::HasChar( sal_UCS4 cChar ) const { return mpImpl->HasChar( cChar ); } - - sal_UCS4 FontCharMap::GetFirstChar() const { return mpImpl->GetFirstChar(); } - - sal_UCS4 FontCharMap::GetNextChar( sal_UCS4 cChar ) const { return mpImpl->GetNextChar( cChar ); } - - sal_UCS4 FontCharMap::GetPrevChar( sal_UCS4 cChar ) const { return mpImpl->GetPrevChar( cChar ); } - - int FontCharMap::GetIndexFromChar( sal_UCS4 cChar ) const { return mpImpl->GetIndexFromChar( cChar ); } - - sal_UCS4 FontCharMap::GetCharFromIndex( int nIndex ) const { return mpImpl->GetCharFromIndex( nIndex ); } - - // on some systems we have to get the font attributes from the name table // since neither head's macStyle nor OS/2's panose are easily available // during font enumeration. macStyle bits would be not sufficient anyway @@ -848,6 +784,4 @@ void UpdateAttributesFromPSName( const OUString& rPSName, ImplDevFontAttributes& } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx index 9f1333ff4080..0e1fd7e6a4fc 100644 --- a/vcl/source/gdi/impimage.cxx +++ b/vcl/source/gdi/impimage.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/outdev.hxx> #include <vcl/bitmapex.hxx> #include <vcl/alpha.hxx> diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx index c996456675a2..9ba36dfea7b9 100644 --- a/vcl/source/gdi/impimagetree.cxx +++ b/vcl/source/gdi/impimagetree.cxx @@ -145,7 +145,6 @@ bool ImplImageTree::loadDefaultImage( style, bitmap, false); } - bool ImplImageTree::doLoadImage( OUString const & name, OUString const & style, BitmapEx & bitmap, bool localized) diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx index 317c6c90e7e5..87a15e422048 100644 --- a/vcl/source/gdi/impvect.cxx +++ b/vcl/source/gdi/impvect.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdlib.h> #include <vcl/bmpacc.hxx> #include <tools/poly.hxx> diff --git a/vcl/source/gdi/impvect.hxx b/vcl/source/gdi/impvect.hxx index e0d8d4d1a9ef..f903dcdd44c0 100644 --- a/vcl/source/gdi/impvect.hxx +++ b/vcl/source/gdi/impvect.hxx @@ -23,10 +23,8 @@ #include <tools/poly.hxx> #include <vcl/gdimtf.hxx> - // - Vectorizer - - class BitmapReadAccess; class ImplChain; class ImplVectMap; diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index 82354f1f14a7..ec1f44f6eb8b 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -26,7 +26,6 @@ #include <jobset.h> #include <boost/scoped_array.hpp> - #define JOBSET_FILE364_SYSTEM ((sal_uInt16)0xFFFF) #define JOBSET_FILE605_SYSTEM ((sal_uInt16)0xFFFE) diff --git a/vcl/source/gdi/lineinfo.cxx b/vcl/source/gdi/lineinfo.cxx index 91c299177d63..a3c7fdb6bdd0 100644 --- a/vcl/source/gdi/lineinfo.cxx +++ b/vcl/source/gdi/lineinfo.cxx @@ -26,11 +26,8 @@ #include <basegfx/polygon/b2dlinegeometry.hxx> #include <numeric> - - // - ImplLineInfo - - ImplLineInfo::ImplLineInfo() : mnRefCount ( 1 ), meStyle ( LINE_SOLID ), @@ -45,8 +42,6 @@ ImplLineInfo::ImplLineInfo() : { } - - ImplLineInfo::ImplLineInfo( const ImplLineInfo& rImplLineInfo ) : mnRefCount ( 1 ), meStyle ( rImplLineInfo.meStyle ), @@ -61,8 +56,6 @@ ImplLineInfo::ImplLineInfo( const ImplLineInfo& rImplLineInfo ) : { } - - inline bool ImplLineInfo::operator==( const ImplLineInfo& rB ) const { return(meStyle == rB.meStyle @@ -76,10 +69,8 @@ inline bool ImplLineInfo::operator==( const ImplLineInfo& rB ) const && meLineCap == rB.meLineCap); } - // - LineInfo - - LineInfo::LineInfo( LineStyle eStyle, long nWidth ) { mpImplLineInfo = new ImplLineInfo; @@ -87,24 +78,18 @@ LineInfo::LineInfo( LineStyle eStyle, long nWidth ) mpImplLineInfo->mnWidth = nWidth; } - - LineInfo::LineInfo( const LineInfo& rLineInfo ) { mpImplLineInfo = rLineInfo.mpImplLineInfo; mpImplLineInfo->mnRefCount++; } - - LineInfo::~LineInfo() { if( !( --mpImplLineInfo->mnRefCount ) ) delete mpImplLineInfo; } - - LineInfo& LineInfo::operator=( const LineInfo& rLineInfo ) { @@ -117,8 +102,6 @@ LineInfo& LineInfo::operator=( const LineInfo& rLineInfo ) return *this; } - - bool LineInfo::operator==( const LineInfo& rLineInfo ) const { @@ -126,8 +109,6 @@ bool LineInfo::operator==( const LineInfo& rLineInfo ) const *mpImplLineInfo == *rLineInfo.mpImplLineInfo ); } - - void LineInfo::ImplMakeUnique() { if( mpImplLineInfo->mnRefCount != 1 ) @@ -139,64 +120,48 @@ void LineInfo::ImplMakeUnique() } } - - void LineInfo::SetStyle( LineStyle eStyle ) { ImplMakeUnique(); mpImplLineInfo->meStyle = eStyle; } - - void LineInfo::SetWidth( long nWidth ) { ImplMakeUnique(); mpImplLineInfo->mnWidth = nWidth; } - - void LineInfo::SetDashCount( sal_uInt16 nDashCount ) { ImplMakeUnique(); mpImplLineInfo->mnDashCount = nDashCount; } - - void LineInfo::SetDashLen( long nDashLen ) { ImplMakeUnique(); mpImplLineInfo->mnDashLen = nDashLen; } - - void LineInfo::SetDotCount( sal_uInt16 nDotCount ) { ImplMakeUnique(); mpImplLineInfo->mnDotCount = nDotCount; } - - void LineInfo::SetDotLen( long nDotLen ) { ImplMakeUnique(); mpImplLineInfo->mnDotLen = nDotLen; } - - void LineInfo::SetDistance( long nDistance ) { ImplMakeUnique(); mpImplLineInfo->mnDistance = nDistance; } - - void LineInfo::SetLineJoin(basegfx::B2DLineJoin eLineJoin) { @@ -207,8 +172,6 @@ void LineInfo::SetLineJoin(basegfx::B2DLineJoin eLineJoin) } } - - void LineInfo::SetLineCap(com::sun::star::drawing::LineCap eLineCap) { if(eLineCap != mpImplLineInfo->meLineCap) @@ -218,8 +181,6 @@ void LineInfo::SetLineCap(com::sun::star::drawing::LineCap eLineCap) } } - - bool LineInfo::IsDefault() const { return( !mpImplLineInfo->mnWidth @@ -227,8 +188,6 @@ bool LineInfo::IsDefault() const && ( com::sun::star::drawing::LineCap_BUTT == mpImplLineInfo->meLineCap)); } - - SvStream& ReadImplLineInfo( SvStream& rIStm, ImplLineInfo& rImplLineInfo ) { VersionCompat aCompat( rIStm, STREAM_READ ); @@ -266,8 +225,6 @@ SvStream& ReadImplLineInfo( SvStream& rIStm, ImplLineInfo& rImplLineInfo ) return rIStm; } - - SvStream& WriteImplLineInfo( SvStream& rOStm, const ImplLineInfo& rImplLineInfo ) { VersionCompat aCompat( rOStm, STREAM_WRITE, 4 ); @@ -290,23 +247,17 @@ SvStream& WriteImplLineInfo( SvStream& rOStm, const ImplLineInfo& rImplLineInfo return rOStm; } - - SvStream& ReadLineInfo( SvStream& rIStm, LineInfo& rLineInfo ) { rLineInfo.ImplMakeUnique(); return ReadImplLineInfo( rIStm, *rLineInfo.mpImplLineInfo ); } - - SvStream& WriteLineInfo( SvStream& rOStm, const LineInfo& rLineInfo ) { return WriteImplLineInfo( rOStm, *rLineInfo.mpImplLineInfo ); } - - void LineInfo::applyToB2DPolyPolygon( basegfx::B2DPolyPolygon& io_rLinePolyPolygon, basegfx::B2DPolyPolygon& o_rFillPolyPolygon) const diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx index 2a723a987e70..f48230a225a9 100644 --- a/vcl/source/gdi/mapmod.cxx +++ b/vcl/source/gdi/mapmod.cxx @@ -22,7 +22,6 @@ #include <tools/debug.hxx> #include <vcl/mapmod.hxx> - ImplMapMode::ImplMapMode() : maOrigin( 0, 0 ), maScaleX( 1, 1 ), diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index abd250d78748..e563a37168ac 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -30,16 +30,12 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <unotools/fontdefs.hxx> - - inline void ImplScalePoint( Point& rPt, double fScaleX, double fScaleY ) { rPt.X() = FRound( fScaleX * rPt.X() ); rPt.Y() = FRound( fScaleY * rPt.Y() ); } - - inline void ImplScaleRect( Rectangle& rRect, double fScaleX, double fScaleY ) { Point aTL( rRect.TopLeft() ); @@ -52,16 +48,12 @@ inline void ImplScaleRect( Rectangle& rRect, double fScaleX, double fScaleY ) rRect.Justify(); } - - inline void ImplScalePoly( Polygon& rPoly, double fScaleX, double fScaleY ) { for( sal_uInt16 i = 0, nCount = rPoly.GetSize(); i < nCount; i++ ) ImplScalePoint( rPoly[ i ], fScaleX, fScaleY ); } - - inline void ImplScaleLineInfo( LineInfo& rLineInfo, double fScaleX, double fScaleY ) { if( !rLineInfo.IsDefault() ) @@ -75,83 +67,59 @@ inline void ImplScaleLineInfo( LineInfo& rLineInfo, double fScaleX, double fScal } } - - #define COMPAT( _def_rIStm ) VersionCompat aCompat( ( _def_rIStm ), STREAM_READ ); #define WRITE_BASE_COMPAT( _def_rOStm, _def_nVer, _pWriteData ) \ MetaAction::Write( ( _def_rOStm ), _pWriteData ); \ VersionCompat aCompat( ( _def_rOStm ), STREAM_WRITE, ( _def_nVer ) ); - - MetaAction::MetaAction() : mnRefCount( 1 ), mnType( META_NULL_ACTION ) { } - - MetaAction::MetaAction( sal_uInt16 nType ) : mnRefCount( 1 ), mnType( nType ) { } - - MetaAction::~MetaAction() { } - - void MetaAction::Execute( OutputDevice* ) { } - - MetaAction* MetaAction::Clone() { return new MetaAction; } - - void MetaAction::Move( long, long ) { } - - void MetaAction::Scale( double, double ) { } - - bool MetaAction::Compare( const MetaAction& ) const { return true; } - - void MetaAction::Write( SvStream& rOStm, ImplMetaWriteData* ) { rOStm.WriteUInt16( mnType ); } - - void MetaAction::Read( SvStream&, ImplMetaReadData* ) { // DO NOT read mnType - ReadMetaAction already did that! } - - MetaAction* MetaAction::ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData ) { MetaAction* pAction = NULL; @@ -233,12 +201,8 @@ MetaAction* MetaAction::ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData return pAction; } - - IMPL_META_ACTION( Pixel, META_PIXEL_ACTION ) - - MetaPixelAction::MetaPixelAction( const Point& rPt, const Color& rColor ) : MetaAction ( META_PIXEL_ACTION ), maPt ( rPt ), @@ -246,15 +210,11 @@ MetaPixelAction::MetaPixelAction( const Point& rPt, const Color& rColor ) : { } - - void MetaPixelAction::Execute( OutputDevice* pOut ) { pOut->DrawPixel( maPt, maColor ); } - - MetaAction* MetaPixelAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaPixelAction( *this ); @@ -262,30 +222,22 @@ MetaAction* MetaPixelAction::Clone() return pClone; } - - void MetaPixelAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaPixelAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPt, fScaleX, fScaleY ); } - - bool MetaPixelAction::Compare( const MetaAction& rMetaAction ) const { return ( maPt == ((MetaPixelAction&)rMetaAction).maPt ) && ( maColor == ((MetaPixelAction&)rMetaAction).maColor ); } - - void MetaPixelAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -293,8 +245,6 @@ void MetaPixelAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) maColor.Write( rOStm, true ); } - - void MetaPixelAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -302,27 +252,19 @@ void MetaPixelAction::Read( SvStream& rIStm, ImplMetaReadData* ) maColor.Read( rIStm, true ); } - - IMPL_META_ACTION( Point, META_POINT_ACTION ) - - MetaPointAction::MetaPointAction( const Point& rPt ) : MetaAction ( META_POINT_ACTION ), maPt ( rPt ) { } - - void MetaPointAction::Execute( OutputDevice* pOut ) { pOut->DrawPixel( maPt ); } - - MetaAction* MetaPointAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaPointAction( *this ); @@ -330,49 +272,35 @@ MetaAction* MetaPointAction::Clone() return pClone; } - - void MetaPointAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaPointAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPt, fScaleX, fScaleY ); } - - bool MetaPointAction::Compare( const MetaAction& rMetaAction ) const { return maPt == ((MetaPointAction&)rMetaAction).maPt; } - - void MetaPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); WritePair( rOStm, maPt ); } - - void MetaPointAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadPair( rIStm, maPt ); } - - IMPL_META_ACTION( Line, META_LINE_ACTION ) - - MetaLineAction::MetaLineAction( const Point& rStart, const Point& rEnd ) : MetaAction ( META_LINE_ACTION ), maStartPt ( rStart ), @@ -380,8 +308,6 @@ MetaLineAction::MetaLineAction( const Point& rStart, const Point& rEnd ) : { } - - MetaLineAction::MetaLineAction( const Point& rStart, const Point& rEnd, const LineInfo& rLineInfo ) : MetaAction ( META_LINE_ACTION ), @@ -391,8 +317,6 @@ MetaLineAction::MetaLineAction( const Point& rStart, const Point& rEnd, { } - - void MetaLineAction::Execute( OutputDevice* pOut ) { if( maLineInfo.IsDefault() ) @@ -401,8 +325,6 @@ void MetaLineAction::Execute( OutputDevice* pOut ) pOut->DrawLine( maStartPt, maEndPt, maLineInfo ); } - - MetaAction* MetaLineAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaLineAction( *this ); @@ -410,16 +332,12 @@ MetaAction* MetaLineAction::Clone() return pClone; } - - void MetaLineAction::Move( long nHorzMove, long nVertMove ) { maStartPt.Move( nHorzMove, nVertMove ); maEndPt.Move( nHorzMove, nVertMove ); } - - void MetaLineAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maStartPt, fScaleX, fScaleY ); @@ -427,8 +345,6 @@ void MetaLineAction::Scale( double fScaleX, double fScaleY ) ImplScaleLineInfo( maLineInfo, fScaleX, fScaleY ); } - - bool MetaLineAction::Compare( const MetaAction& rMetaAction ) const { return ( maLineInfo == ((MetaLineAction&)rMetaAction).maLineInfo ) && @@ -436,8 +352,6 @@ bool MetaLineAction::Compare( const MetaAction& rMetaAction ) const ( maEndPt == ((MetaLineAction&)rMetaAction).maEndPt ); } - - void MetaLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); @@ -447,8 +361,6 @@ void MetaLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WriteLineInfo( rOStm, maLineInfo ); // Version 2 } - - void MetaLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -464,27 +376,19 @@ void MetaLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) } } - - IMPL_META_ACTION( Rect, META_RECT_ACTION ) - - MetaRectAction::MetaRectAction( const Rectangle& rRect ) : MetaAction ( META_RECT_ACTION ), maRect ( rRect ) { } - - void MetaRectAction::Execute( OutputDevice* pOut ) { pOut->DrawRect( maRect ); } - - MetaAction* MetaRectAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaRectAction( *this ); @@ -492,49 +396,35 @@ MetaAction* MetaRectAction::Clone() return pClone; } - - void MetaRectAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); } - - void MetaRectAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); } - - bool MetaRectAction::Compare( const MetaAction& rMetaAction ) const { return maRect == ((MetaRectAction&)rMetaAction).maRect; } - - void MetaRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); WriteRectangle( rOStm, maRect ); } - - void MetaRectAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadRectangle( rIStm, maRect ); } - - IMPL_META_ACTION( RoundRect, META_ROUNDRECT_ACTION ) - - MetaRoundRectAction::MetaRoundRectAction( const Rectangle& rRect, sal_uInt32 nHorzRound, sal_uInt32 nVertRound ) : MetaAction ( META_ROUNDRECT_ACTION ), @@ -544,15 +434,11 @@ MetaRoundRectAction::MetaRoundRectAction( const Rectangle& rRect, { } - - void MetaRoundRectAction::Execute( OutputDevice* pOut ) { pOut->DrawRect( maRect, mnHorzRound, mnVertRound ); } - - MetaAction* MetaRoundRectAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaRoundRectAction( *this ); @@ -560,15 +446,11 @@ MetaAction* MetaRoundRectAction::Clone() return pClone; } - - void MetaRoundRectAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); } - - void MetaRoundRectAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); @@ -576,8 +458,6 @@ void MetaRoundRectAction::Scale( double fScaleX, double fScaleY ) mnVertRound = FRound( mnVertRound * fabs(fScaleY) ); } - - bool MetaRoundRectAction::Compare( const MetaAction& rMetaAction ) const { return ( maRect == ((MetaRoundRectAction&)rMetaAction).maRect ) && @@ -585,8 +465,6 @@ bool MetaRoundRectAction::Compare( const MetaAction& rMetaAction ) const ( mnVertRound == ((MetaRoundRectAction&)rMetaAction).mnVertRound ); } - - void MetaRoundRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -594,35 +472,25 @@ void MetaRoundRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUInt32( mnHorzRound ).WriteUInt32( mnVertRound ); } - - void MetaRoundRectAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadRectangle( rIStm, maRect ).ReadUInt32( mnHorzRound ).ReadUInt32( mnVertRound ); } - - IMPL_META_ACTION( Ellipse, META_ELLIPSE_ACTION ) - - MetaEllipseAction::MetaEllipseAction( const Rectangle& rRect ) : MetaAction ( META_ELLIPSE_ACTION ), maRect ( rRect ) { } - - void MetaEllipseAction::Execute( OutputDevice* pOut ) { pOut->DrawEllipse( maRect ); } - - MetaAction* MetaEllipseAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaEllipseAction( *this ); @@ -630,49 +498,35 @@ MetaAction* MetaEllipseAction::Clone() return pClone; } - - void MetaEllipseAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); } - - void MetaEllipseAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); } - - bool MetaEllipseAction::Compare( const MetaAction& rMetaAction ) const { return maRect == ((MetaEllipseAction&)rMetaAction).maRect; } - - void MetaEllipseAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); WriteRectangle( rOStm, maRect ); } - - void MetaEllipseAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadRectangle( rIStm, maRect ); } - - IMPL_META_ACTION( Arc, META_ARC_ACTION ) - - MetaArcAction::MetaArcAction( const Rectangle& rRect, const Point& rStart, const Point& rEnd ) : MetaAction ( META_ARC_ACTION ), @@ -682,15 +536,11 @@ MetaArcAction::MetaArcAction( const Rectangle& rRect, { } - - void MetaArcAction::Execute( OutputDevice* pOut ) { pOut->DrawArc( maRect, maStartPt, maEndPt ); } - - MetaAction* MetaArcAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaArcAction( *this ); @@ -698,8 +548,6 @@ MetaAction* MetaArcAction::Clone() return pClone; } - - void MetaArcAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); @@ -707,8 +555,6 @@ void MetaArcAction::Move( long nHorzMove, long nVertMove ) maEndPt.Move( nHorzMove, nVertMove ); } - - void MetaArcAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); @@ -716,8 +562,6 @@ void MetaArcAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maEndPt, fScaleX, fScaleY ); } - - bool MetaArcAction::Compare( const MetaAction& rMetaAction ) const { return ( maRect == ((MetaArcAction&)rMetaAction).maRect ) && @@ -725,8 +569,6 @@ bool MetaArcAction::Compare( const MetaAction& rMetaAction ) const ( maEndPt == ((MetaArcAction&)rMetaAction).maEndPt ); } - - void MetaArcAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -735,8 +577,6 @@ void MetaArcAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WritePair( rOStm, maEndPt ); } - - void MetaArcAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -745,12 +585,8 @@ void MetaArcAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maEndPt ); } - - IMPL_META_ACTION( Pie, META_PIE_ACTION ) - - MetaPieAction::MetaPieAction( const Rectangle& rRect, const Point& rStart, const Point& rEnd ) : MetaAction ( META_PIE_ACTION ), @@ -760,15 +596,11 @@ MetaPieAction::MetaPieAction( const Rectangle& rRect, { } - - void MetaPieAction::Execute( OutputDevice* pOut ) { pOut->DrawPie( maRect, maStartPt, maEndPt ); } - - MetaAction* MetaPieAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaPieAction( *this ); @@ -776,8 +608,6 @@ MetaAction* MetaPieAction::Clone() return pClone; } - - void MetaPieAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); @@ -785,8 +615,6 @@ void MetaPieAction::Move( long nHorzMove, long nVertMove ) maEndPt.Move( nHorzMove, nVertMove ); } - - void MetaPieAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); @@ -794,8 +622,6 @@ void MetaPieAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maEndPt, fScaleX, fScaleY ); } - - bool MetaPieAction::Compare( const MetaAction& rMetaAction ) const { return ( maRect == ((MetaPieAction&)rMetaAction).maRect ) && @@ -803,8 +629,6 @@ bool MetaPieAction::Compare( const MetaAction& rMetaAction ) const ( maEndPt == ((MetaPieAction&)rMetaAction).maEndPt ); } - - void MetaPieAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -813,8 +637,6 @@ void MetaPieAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WritePair( rOStm, maEndPt ); } - - void MetaPieAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -823,12 +645,8 @@ void MetaPieAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maEndPt ); } - - IMPL_META_ACTION( Chord, META_CHORD_ACTION ) - - MetaChordAction::MetaChordAction( const Rectangle& rRect, const Point& rStart, const Point& rEnd ) : MetaAction ( META_CHORD_ACTION ), @@ -838,15 +656,11 @@ MetaChordAction::MetaChordAction( const Rectangle& rRect, { } - - void MetaChordAction::Execute( OutputDevice* pOut ) { pOut->DrawChord( maRect, maStartPt, maEndPt ); } - - MetaAction* MetaChordAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaChordAction( *this ); @@ -854,8 +668,6 @@ MetaAction* MetaChordAction::Clone() return pClone; } - - void MetaChordAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); @@ -863,8 +675,6 @@ void MetaChordAction::Move( long nHorzMove, long nVertMove ) maEndPt.Move( nHorzMove, nVertMove ); } - - void MetaChordAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); @@ -872,8 +682,6 @@ void MetaChordAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maEndPt, fScaleX, fScaleY ); } - - bool MetaChordAction::Compare( const MetaAction& rMetaAction ) const { return ( maRect == ((MetaChordAction&)rMetaAction).maRect ) && @@ -881,8 +689,6 @@ bool MetaChordAction::Compare( const MetaAction& rMetaAction ) const ( maEndPt == ((MetaChordAction&)rMetaAction).maEndPt ); } - - void MetaChordAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -891,8 +697,6 @@ void MetaChordAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WritePair( rOStm, maEndPt ); } - - void MetaChordAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -901,20 +705,14 @@ void MetaChordAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maEndPt ); } - - IMPL_META_ACTION( PolyLine, META_POLYLINE_ACTION ) - - MetaPolyLineAction::MetaPolyLineAction( const Polygon& rPoly ) : MetaAction ( META_POLYLINE_ACTION ), maPoly ( rPoly ) { } - - MetaPolyLineAction::MetaPolyLineAction( const Polygon& rPoly, const LineInfo& rLineInfo ) : MetaAction ( META_POLYLINE_ACTION ), maLineInfo ( rLineInfo ), @@ -922,8 +720,6 @@ MetaPolyLineAction::MetaPolyLineAction( const Polygon& rPoly, const LineInfo& rL { } - - void MetaPolyLineAction::Execute( OutputDevice* pOut ) { if( maLineInfo.IsDefault() ) @@ -932,8 +728,6 @@ void MetaPolyLineAction::Execute( OutputDevice* pOut ) pOut->DrawPolyLine( maPoly, maLineInfo ); } - - MetaAction* MetaPolyLineAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaPolyLineAction( *this ); @@ -941,23 +735,17 @@ MetaAction* MetaPolyLineAction::Clone() return pClone; } - - void MetaPolyLineAction::Move( long nHorzMove, long nVertMove ) { maPoly.Move( nHorzMove, nVertMove ); } - - void MetaPolyLineAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoly( maPoly, fScaleX, fScaleY ); ImplScaleLineInfo( maLineInfo, fScaleX, fScaleY ); } - - bool MetaPolyLineAction::Compare( const MetaAction& rMetaAction ) const { bool bIsEqual = true; @@ -969,8 +757,6 @@ bool MetaPolyLineAction::Compare( const MetaAction& rMetaAction ) const } - - void MetaPolyLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 3, pData ); @@ -987,8 +773,6 @@ void MetaPolyLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) maPoly.Write( rOStm ); } - - void MetaPolyLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -1008,27 +792,19 @@ void MetaPolyLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) } } - - IMPL_META_ACTION( Polygon, META_POLYGON_ACTION ) - - MetaPolygonAction::MetaPolygonAction( const Polygon& rPoly ) : MetaAction ( META_POLYGON_ACTION ), maPoly ( rPoly ) { } - - void MetaPolygonAction::Execute( OutputDevice* pOut ) { pOut->DrawPolygon( maPoly ); } - - MetaAction* MetaPolygonAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaPolygonAction( *this ); @@ -1036,29 +812,21 @@ MetaAction* MetaPolygonAction::Clone() return pClone; } - - void MetaPolygonAction::Move( long nHorzMove, long nVertMove ) { maPoly.Move( nHorzMove, nVertMove ); } - - void MetaPolygonAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoly( maPoly, fScaleX, fScaleY ); } - - bool MetaPolygonAction::Compare( const MetaAction& rMetaAction ) const { return maPoly.IsEqual(((MetaPolygonAction&)rMetaAction).maPoly ); } - - void MetaPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); @@ -1073,8 +841,6 @@ void MetaPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) maPoly.Write( rOStm ); } - - void MetaPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -1090,27 +856,19 @@ void MetaPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* ) } } - - IMPL_META_ACTION( PolyPolygon, META_POLYPOLYGON_ACTION ) - - MetaPolyPolygonAction::MetaPolyPolygonAction( const PolyPolygon& rPolyPoly ) : MetaAction ( META_POLYPOLYGON_ACTION ), maPolyPoly ( rPolyPoly ) { } - - void MetaPolyPolygonAction::Execute( OutputDevice* pOut ) { pOut->DrawPolyPolygon( maPolyPoly ); } - - MetaAction* MetaPolyPolygonAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaPolyPolygonAction( *this ); @@ -1118,30 +876,22 @@ MetaAction* MetaPolyPolygonAction::Clone() return pClone; } - - void MetaPolyPolygonAction::Move( long nHorzMove, long nVertMove ) { maPolyPoly.Move( nHorzMove, nVertMove ); } - - void MetaPolyPolygonAction::Scale( double fScaleX, double fScaleY ) { for( sal_uInt16 i = 0, nCount = maPolyPoly.Count(); i < nCount; i++ ) ImplScalePoly( maPolyPoly[ i ], fScaleX, fScaleY ); } - - bool MetaPolyPolygonAction::Compare( const MetaAction& rMetaAction ) const { return maPolyPoly.IsEqual(((MetaPolyPolygonAction&)rMetaAction).maPolyPoly ); } - - void MetaPolyPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); @@ -1174,8 +924,6 @@ void MetaPolyPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } - - void MetaPolyPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -1196,12 +944,8 @@ void MetaPolyPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* ) } } - - IMPL_META_ACTION( Text, META_TEXT_ACTION ) - - MetaTextAction::MetaTextAction( const Point& rPt, const OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen ) : MetaAction ( META_TEXT_ACTION ), @@ -1212,15 +956,11 @@ MetaTextAction::MetaTextAction( const Point& rPt, const OUString& rStr, { } - - void MetaTextAction::Execute( OutputDevice* pOut ) { pOut->DrawText( maPt, maStr, mnIndex, mnLen ); } - - MetaAction* MetaTextAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaTextAction( *this ); @@ -1228,22 +968,16 @@ MetaAction* MetaTextAction::Clone() return pClone; } - - void MetaTextAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaTextAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPt, fScaleX, fScaleY ); } - - bool MetaTextAction::Compare( const MetaAction& rMetaAction ) const { return ( maPt == ((MetaTextAction&)rMetaAction).maPt ) && @@ -1252,8 +986,6 @@ bool MetaTextAction::Compare( const MetaAction& rMetaAction ) const ( mnLen == ((MetaTextAction&)rMetaAction).mnLen ); } - - void MetaTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); @@ -1265,8 +997,6 @@ void MetaTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) write_uInt16_lenPrefixed_uInt16s_FromOUString(rOStm, maStr); // version 2 } - - void MetaTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); @@ -1283,8 +1013,6 @@ void MetaTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) maStr = read_uInt16_lenPrefixed_uInt16s_ToOUString(rIStm); } - - MetaTextArrayAction::MetaTextArrayAction() : MetaAction ( META_TEXTARRAY_ACTION ), mpDXAry ( NULL ), @@ -1293,8 +1021,6 @@ MetaTextArrayAction::MetaTextArrayAction() : { } - - MetaTextArrayAction::MetaTextArrayAction( const MetaTextArrayAction& rAction ) : MetaAction ( META_TEXTARRAY_ACTION ), maStartPt ( rAction.maStartPt ), @@ -1313,8 +1039,6 @@ MetaTextArrayAction::MetaTextArrayAction( const MetaTextArrayAction& rAction ) : mpDXAry = NULL; } - - MetaTextArrayAction::MetaTextArrayAction( const Point& rStartPt, const OUString& rStr, const sal_Int32* pDXAry, @@ -1337,22 +1061,16 @@ MetaTextArrayAction::MetaTextArrayAction( const Point& rStartPt, mpDXAry = NULL; } - - MetaTextArrayAction::~MetaTextArrayAction() { delete[] mpDXAry; } - - void MetaTextArrayAction::Execute( OutputDevice* pOut ) { pOut->DrawTextArray( maStartPt, maStr, mpDXAry, mnIndex, mnLen ); } - - MetaAction* MetaTextArrayAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaTextArrayAction( *this ); @@ -1360,15 +1078,11 @@ MetaAction* MetaTextArrayAction::Clone() return pClone; } - - void MetaTextArrayAction::Move( long nHorzMove, long nVertMove ) { maStartPt.Move( nHorzMove, nVertMove ); } - - void MetaTextArrayAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maStartPt, fScaleX, fScaleY ); @@ -1380,8 +1094,6 @@ void MetaTextArrayAction::Scale( double fScaleX, double fScaleY ) } } - - bool MetaTextArrayAction::Compare( const MetaAction& rMetaAction ) const { return ( maStartPt == ((MetaTextArrayAction&)rMetaAction).maStartPt ) && @@ -1391,8 +1103,6 @@ bool MetaTextArrayAction::Compare( const MetaAction& rMetaAction ) const ( memcmp( mpDXAry, ((MetaTextArrayAction&)rMetaAction).mpDXAry, mnLen ) == 0 ); } - - void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { const sal_Int32 nAryLen = mpDXAry ? mnLen : 0; @@ -1410,8 +1120,6 @@ void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) write_uInt16_lenPrefixed_uInt16s_FromOUString(rOStm, maStr); // version 2 } - - void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { sal_Int32 nAryLen; @@ -1476,12 +1184,8 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) } } - - IMPL_META_ACTION( StretchText, META_STRETCHTEXT_ACTION ) - - MetaStretchTextAction::MetaStretchTextAction( const Point& rPt, sal_uInt32 nWidth, const OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen ) : @@ -1494,15 +1198,11 @@ MetaStretchTextAction::MetaStretchTextAction( const Point& rPt, sal_uInt32 nWidt { } - - void MetaStretchTextAction::Execute( OutputDevice* pOut ) { pOut->DrawStretchText( maPt, mnWidth, maStr, mnIndex, mnLen ); } - - MetaAction* MetaStretchTextAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaStretchTextAction( *this ); @@ -1510,23 +1210,17 @@ MetaAction* MetaStretchTextAction::Clone() return pClone; } - - void MetaStretchTextAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaStretchTextAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPt, fScaleX, fScaleY ); mnWidth = (sal_uLong)FRound( mnWidth * fabs(fScaleX) ); } - - bool MetaStretchTextAction::Compare( const MetaAction& rMetaAction ) const { return ( maPt == ((MetaStretchTextAction&)rMetaAction).maPt ) && @@ -1536,8 +1230,6 @@ bool MetaStretchTextAction::Compare( const MetaAction& rMetaAction ) const ( mnLen == ((MetaStretchTextAction&)rMetaAction).mnLen ); } - - void MetaStretchTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); @@ -1550,8 +1242,6 @@ void MetaStretchTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) write_uInt16_lenPrefixed_uInt16s_FromOUString(rOStm, maStr); // version 2 } - - void MetaStretchTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); @@ -1569,12 +1259,8 @@ void MetaStretchTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) maStr = read_uInt16_lenPrefixed_uInt16s_ToOUString(rIStm); } - - IMPL_META_ACTION( TextRect, META_TEXTRECT_ACTION ) - - MetaTextRectAction::MetaTextRectAction( const Rectangle& rRect, const OUString& rStr, sal_uInt16 nStyle ) : MetaAction ( META_TEXTRECT_ACTION ), @@ -1584,15 +1270,11 @@ MetaTextRectAction::MetaTextRectAction( const Rectangle& rRect, { } - - void MetaTextRectAction::Execute( OutputDevice* pOut ) { pOut->DrawText( maRect, maStr, mnStyle ); } - - MetaAction* MetaTextRectAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaTextRectAction( *this ); @@ -1600,22 +1282,16 @@ MetaAction* MetaTextRectAction::Clone() return pClone; } - - void MetaTextRectAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); } - - void MetaTextRectAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); } - - bool MetaTextRectAction::Compare( const MetaAction& rMetaAction ) const { return ( maRect == ((MetaTextRectAction&)rMetaAction).maRect ) && @@ -1623,8 +1299,6 @@ bool MetaTextRectAction::Compare( const MetaAction& rMetaAction ) const ( mnStyle == ((MetaTextRectAction&)rMetaAction).mnStyle ); } - - void MetaTextRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); @@ -1635,8 +1309,6 @@ void MetaTextRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) write_uInt16_lenPrefixed_uInt16s_FromOUString(rOStm, maStr); // version 2 } - - void MetaTextRectAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); @@ -1648,12 +1320,8 @@ void MetaTextRectAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) maStr = read_uInt16_lenPrefixed_uInt16s_ToOUString(rIStm); } - - IMPL_META_ACTION( TextLine, META_TEXTLINE_ACTION ) - - MetaTextLineAction::MetaTextLineAction( const Point& rPos, long nWidth, FontStrikeout eStrikeout, FontUnderline eUnderline, @@ -1667,15 +1335,11 @@ MetaTextLineAction::MetaTextLineAction( const Point& rPos, long nWidth, { } - - void MetaTextLineAction::Execute( OutputDevice* pOut ) { pOut->DrawTextLine( maPos, mnWidth, meStrikeout, meUnderline, meOverline ); } - - MetaAction* MetaTextLineAction::Clone() { MetaAction* pClone = (MetaAction*)new MetaTextLineAction( *this ); @@ -1683,23 +1347,17 @@ MetaAction* MetaTextLineAction::Clone() return pClone; } - - void MetaTextLineAction::Move( long nHorzMove, long nVertMove ) { maPos.Move( nHorzMove, nVertMove ); } - - void MetaTextLineAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPos, fScaleX, fScaleY ); mnWidth = FRound( mnWidth * fabs(fScaleX) ); } - - bool MetaTextLineAction::Compare( const MetaAction& rMetaAction ) const { return ( maPos == ((MetaTextLineAction&)rMetaAction).maPos ) && @@ -1709,8 +1367,6 @@ bool MetaTextLineAction::Compare( const MetaAction& rMetaAction ) const ( meOverline == ((MetaTextLineAction&)rMetaAction).meOverline ); } - - void MetaTextLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); @@ -1724,8 +1380,6 @@ void MetaTextLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUInt32( static_cast<sal_uInt32>(meOverline) ); } - - void MetaTextLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -1748,12 +1402,8 @@ void MetaTextLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) } } - - IMPL_META_ACTION( Bmp, META_BMP_ACTION ) - - MetaBmpAction::MetaBmpAction( const Point& rPt, const Bitmap& rBmp ) : MetaAction ( META_BMP_ACTION ), maBmp ( rBmp ), @@ -1761,15 +1411,11 @@ MetaBmpAction::MetaBmpAction( const Point& rPt, const Bitmap& rBmp ) : { } - - void MetaBmpAction::Execute( OutputDevice* pOut ) { pOut->DrawBitmap( maPt, maBmp ); } - - MetaAction* MetaBmpAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaBmpAction( *this ); @@ -1777,30 +1423,22 @@ MetaAction* MetaBmpAction::Clone() return pClone; } - - void MetaBmpAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaBmpAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPt, fScaleX, fScaleY ); } - - bool MetaBmpAction::Compare( const MetaAction& rMetaAction ) const { return maBmp.IsEqual(((MetaBmpAction&)rMetaAction).maBmp ) && ( maPt == ((MetaBmpAction&)rMetaAction).maPt ); } - - void MetaBmpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmp ) @@ -1811,8 +1449,6 @@ void MetaBmpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } - - void MetaBmpAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -1820,12 +1456,8 @@ void MetaBmpAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maPt ); } - - IMPL_META_ACTION( BmpScale, META_BMPSCALE_ACTION ) - - MetaBmpScaleAction::MetaBmpScaleAction( const Point& rPt, const Size& rSz, const Bitmap& rBmp ) : MetaAction ( META_BMPSCALE_ACTION ), @@ -1835,15 +1467,11 @@ MetaBmpScaleAction::MetaBmpScaleAction( const Point& rPt, const Size& rSz, { } - - void MetaBmpScaleAction::Execute( OutputDevice* pOut ) { pOut->DrawBitmap( maPt, maSz, maBmp ); } - - MetaAction* MetaBmpScaleAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaBmpScaleAction( *this ); @@ -1851,15 +1479,11 @@ MetaAction* MetaBmpScaleAction::Clone() return pClone; } - - void MetaBmpScaleAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaBmpScaleAction::Scale( double fScaleX, double fScaleY ) { Rectangle aRectangle(maPt, maSz); @@ -1868,8 +1492,6 @@ void MetaBmpScaleAction::Scale( double fScaleX, double fScaleY ) maSz = aRectangle.GetSize(); } - - bool MetaBmpScaleAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmp.IsEqual(((MetaBmpScaleAction&)rMetaAction).maBmp )) && @@ -1877,8 +1499,6 @@ bool MetaBmpScaleAction::Compare( const MetaAction& rMetaAction ) const ( maSz == ((MetaBmpScaleAction&)rMetaAction).maSz ); } - - void MetaBmpScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmp ) @@ -1890,8 +1510,6 @@ void MetaBmpScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } - - void MetaBmpScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -1900,12 +1518,8 @@ void MetaBmpScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSz ); } - - IMPL_META_ACTION( BmpScalePart, META_BMPSCALEPART_ACTION ) - - MetaBmpScalePartAction::MetaBmpScalePartAction( const Point& rDstPt, const Size& rDstSz, const Point& rSrcPt, const Size& rSrcSz, const Bitmap& rBmp ) : @@ -1918,15 +1532,11 @@ MetaBmpScalePartAction::MetaBmpScalePartAction( const Point& rDstPt, const Size& { } - - void MetaBmpScalePartAction::Execute( OutputDevice* pOut ) { pOut->DrawBitmap( maDstPt, maDstSz, maSrcPt, maSrcSz, maBmp ); } - - MetaAction* MetaBmpScalePartAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaBmpScalePartAction( *this ); @@ -1934,15 +1544,11 @@ MetaAction* MetaBmpScalePartAction::Clone() return pClone; } - - void MetaBmpScalePartAction::Move( long nHorzMove, long nVertMove ) { maDstPt.Move( nHorzMove, nVertMove ); } - - void MetaBmpScalePartAction::Scale( double fScaleX, double fScaleY ) { Rectangle aRectangle(maDstPt, maDstSz); @@ -1951,8 +1557,6 @@ void MetaBmpScalePartAction::Scale( double fScaleX, double fScaleY ) maDstSz = aRectangle.GetSize(); } - - bool MetaBmpScalePartAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmp.IsEqual(((MetaBmpScalePartAction&)rMetaAction).maBmp )) && @@ -1962,8 +1566,6 @@ bool MetaBmpScalePartAction::Compare( const MetaAction& rMetaAction ) const ( maSrcSz == ((MetaBmpScalePartAction&)rMetaAction).maSrcSz ); } - - void MetaBmpScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmp ) @@ -1977,8 +1579,6 @@ void MetaBmpScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } - - void MetaBmpScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -1989,12 +1589,8 @@ void MetaBmpScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSrcSz ); } - - IMPL_META_ACTION( BmpEx, META_BMPEX_ACTION ) - - MetaBmpExAction::MetaBmpExAction( const Point& rPt, const BitmapEx& rBmpEx ) : MetaAction ( META_BMPEX_ACTION ), maBmpEx ( rBmpEx ), @@ -2002,15 +1598,11 @@ MetaBmpExAction::MetaBmpExAction( const Point& rPt, const BitmapEx& rBmpEx ) : { } - - void MetaBmpExAction::Execute( OutputDevice* pOut ) { pOut->DrawBitmapEx( maPt, maBmpEx ); } - - MetaAction* MetaBmpExAction::Clone() { MetaBmpExAction* pClone = new MetaBmpExAction( *this ); @@ -2018,30 +1610,22 @@ MetaAction* MetaBmpExAction::Clone() return pClone; } - - void MetaBmpExAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaBmpExAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPt, fScaleX, fScaleY ); } - - bool MetaBmpExAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmpEx.IsEqual(((MetaBmpExAction&)rMetaAction).maBmpEx )) && ( maPt == ((MetaBmpExAction&)rMetaAction).maPt ); } - - void MetaBmpExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmpEx.GetBitmap() ) @@ -2052,8 +1636,6 @@ void MetaBmpExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } - - void MetaBmpExAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2061,12 +1643,8 @@ void MetaBmpExAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maPt ); } - - IMPL_META_ACTION( BmpExScale, META_BMPEXSCALE_ACTION ) - - MetaBmpExScaleAction::MetaBmpExScaleAction( const Point& rPt, const Size& rSz, const BitmapEx& rBmpEx ) : MetaAction ( META_BMPEXSCALE_ACTION ), @@ -2076,15 +1654,11 @@ MetaBmpExScaleAction::MetaBmpExScaleAction( const Point& rPt, const Size& rSz, { } - - void MetaBmpExScaleAction::Execute( OutputDevice* pOut ) { pOut->DrawBitmapEx( maPt, maSz, maBmpEx ); } - - MetaAction* MetaBmpExScaleAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaBmpExScaleAction( *this ); @@ -2092,15 +1666,11 @@ MetaAction* MetaBmpExScaleAction::Clone() return pClone; } - - void MetaBmpExScaleAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaBmpExScaleAction::Scale( double fScaleX, double fScaleY ) { Rectangle aRectangle(maPt, maSz); @@ -2109,8 +1679,6 @@ void MetaBmpExScaleAction::Scale( double fScaleX, double fScaleY ) maSz = aRectangle.GetSize(); } - - bool MetaBmpExScaleAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmpEx.IsEqual(((MetaBmpExScaleAction&)rMetaAction).maBmpEx )) && @@ -2118,8 +1686,6 @@ bool MetaBmpExScaleAction::Compare( const MetaAction& rMetaAction ) const ( maSz == ((MetaBmpExScaleAction&)rMetaAction).maSz ); } - - void MetaBmpExScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmpEx.GetBitmap() ) @@ -2131,8 +1697,6 @@ void MetaBmpExScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } - - void MetaBmpExScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2141,12 +1705,8 @@ void MetaBmpExScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSz ); } - - IMPL_META_ACTION( BmpExScalePart, META_BMPEXSCALEPART_ACTION ) - - MetaBmpExScalePartAction::MetaBmpExScalePartAction( const Point& rDstPt, const Size& rDstSz, const Point& rSrcPt, const Size& rSrcSz, const BitmapEx& rBmpEx ) : @@ -2159,15 +1719,11 @@ MetaBmpExScalePartAction::MetaBmpExScalePartAction( const Point& rDstPt, const S { } - - void MetaBmpExScalePartAction::Execute( OutputDevice* pOut ) { pOut->DrawBitmapEx( maDstPt, maDstSz, maSrcPt, maSrcSz, maBmpEx ); } - - MetaAction* MetaBmpExScalePartAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaBmpExScalePartAction( *this ); @@ -2175,15 +1731,11 @@ MetaAction* MetaBmpExScalePartAction::Clone() return pClone; } - - void MetaBmpExScalePartAction::Move( long nHorzMove, long nVertMove ) { maDstPt.Move( nHorzMove, nVertMove ); } - - void MetaBmpExScalePartAction::Scale( double fScaleX, double fScaleY ) { Rectangle aRectangle(maDstPt, maDstSz); @@ -2192,8 +1744,6 @@ void MetaBmpExScalePartAction::Scale( double fScaleX, double fScaleY ) maDstSz = aRectangle.GetSize(); } - - bool MetaBmpExScalePartAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmpEx.IsEqual(((MetaBmpExScalePartAction&)rMetaAction).maBmpEx )) && @@ -2203,8 +1753,6 @@ bool MetaBmpExScalePartAction::Compare( const MetaAction& rMetaAction ) const ( maSrcSz == ((MetaBmpExScalePartAction&)rMetaAction).maSrcSz ); } - - void MetaBmpExScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmpEx.GetBitmap() ) @@ -2218,8 +1766,6 @@ void MetaBmpExScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData } } - - void MetaBmpExScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2230,12 +1776,8 @@ void MetaBmpExScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSrcSz ); } - - IMPL_META_ACTION( Mask, META_MASK_ACTION ) - - MetaMaskAction::MetaMaskAction( const Point& rPt, const Bitmap& rBmp, const Color& rColor ) : @@ -2246,15 +1788,11 @@ MetaMaskAction::MetaMaskAction( const Point& rPt, { } - - void MetaMaskAction::Execute( OutputDevice* pOut ) { pOut->DrawMask( maPt, maBmp, maColor ); } - - MetaAction* MetaMaskAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaMaskAction( *this ); @@ -2262,22 +1800,16 @@ MetaAction* MetaMaskAction::Clone() return pClone; } - - void MetaMaskAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaMaskAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPt, fScaleX, fScaleY ); } - - bool MetaMaskAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmp.IsEqual(((MetaMaskAction&)rMetaAction).maBmp )) && @@ -2285,8 +1817,6 @@ bool MetaMaskAction::Compare( const MetaAction& rMetaAction ) const ( maPt == ((MetaMaskAction&)rMetaAction).maPt ); } - - void MetaMaskAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmp ) @@ -2297,8 +1827,6 @@ void MetaMaskAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } - - void MetaMaskAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2306,12 +1834,8 @@ void MetaMaskAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maPt ); } - - IMPL_META_ACTION( MaskScale, META_MASKSCALE_ACTION ) - - MetaMaskScaleAction::MetaMaskScaleAction( const Point& rPt, const Size& rSz, const Bitmap& rBmp, const Color& rColor ) : @@ -2323,15 +1847,11 @@ MetaMaskScaleAction::MetaMaskScaleAction( const Point& rPt, const Size& rSz, { } - - void MetaMaskScaleAction::Execute( OutputDevice* pOut ) { pOut->DrawMask( maPt, maSz, maBmp, maColor ); } - - MetaAction* MetaMaskScaleAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaMaskScaleAction( *this ); @@ -2339,15 +1859,11 @@ MetaAction* MetaMaskScaleAction::Clone() return pClone; } - - void MetaMaskScaleAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaMaskScaleAction::Scale( double fScaleX, double fScaleY ) { Rectangle aRectangle(maPt, maSz); @@ -2356,8 +1872,6 @@ void MetaMaskScaleAction::Scale( double fScaleX, double fScaleY ) maSz = aRectangle.GetSize(); } - - bool MetaMaskScaleAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmp.IsEqual(((MetaMaskScaleAction&)rMetaAction).maBmp )) && @@ -2366,8 +1880,6 @@ bool MetaMaskScaleAction::Compare( const MetaAction& rMetaAction ) const ( maSz == ((MetaMaskScaleAction&)rMetaAction).maSz ); } - - void MetaMaskScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmp ) @@ -2379,8 +1891,6 @@ void MetaMaskScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } - - void MetaMaskScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2389,12 +1899,8 @@ void MetaMaskScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSz ); } - - IMPL_META_ACTION( MaskScalePart, META_MASKSCALEPART_ACTION ) - - MetaMaskScalePartAction::MetaMaskScalePartAction( const Point& rDstPt, const Size& rDstSz, const Point& rSrcPt, const Size& rSrcSz, const Bitmap& rBmp, @@ -2409,15 +1915,11 @@ MetaMaskScalePartAction::MetaMaskScalePartAction( const Point& rDstPt, const Siz { } - - void MetaMaskScalePartAction::Execute( OutputDevice* pOut ) { pOut->DrawMask( maDstPt, maDstSz, maSrcPt, maSrcSz, maBmp, maColor ); } - - MetaAction* MetaMaskScalePartAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaMaskScalePartAction( *this ); @@ -2425,15 +1927,11 @@ MetaAction* MetaMaskScalePartAction::Clone() return pClone; } - - void MetaMaskScalePartAction::Move( long nHorzMove, long nVertMove ) { maDstPt.Move( nHorzMove, nVertMove ); } - - void MetaMaskScalePartAction::Scale( double fScaleX, double fScaleY ) { Rectangle aRectangle(maDstPt, maDstSz); @@ -2442,8 +1940,6 @@ void MetaMaskScalePartAction::Scale( double fScaleX, double fScaleY ) maDstSz = aRectangle.GetSize(); } - - bool MetaMaskScalePartAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmp.IsEqual(((MetaMaskScalePartAction&)rMetaAction).maBmp )) && @@ -2454,8 +1950,6 @@ bool MetaMaskScalePartAction::Compare( const MetaAction& rMetaAction ) const ( maSrcSz == ((MetaMaskScalePartAction&)rMetaAction).maSrcSz ); } - - void MetaMaskScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmp ) @@ -2470,8 +1964,6 @@ void MetaMaskScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } - - void MetaMaskScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2483,12 +1975,8 @@ void MetaMaskScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSrcSz ); } - - IMPL_META_ACTION( Gradient, META_GRADIENT_ACTION ) - - MetaGradientAction::MetaGradientAction( const Rectangle& rRect, const Gradient& rGradient ) : MetaAction ( META_GRADIENT_ACTION ), maRect ( rRect ), @@ -2496,15 +1984,11 @@ MetaGradientAction::MetaGradientAction( const Rectangle& rRect, const Gradient& { } - - void MetaGradientAction::Execute( OutputDevice* pOut ) { pOut->DrawGradient( maRect, maGradient ); } - - MetaAction* MetaGradientAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaGradientAction( *this ); @@ -2512,30 +1996,22 @@ MetaAction* MetaGradientAction::Clone() return pClone; } - - void MetaGradientAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); } - - void MetaGradientAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); } - - bool MetaGradientAction::Compare( const MetaAction& rMetaAction ) const { return ( maRect == ((MetaGradientAction&)rMetaAction).maRect ) && ( maGradient == ((MetaGradientAction&)rMetaAction).maGradient ); } - - void MetaGradientAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -2543,8 +2019,6 @@ void MetaGradientAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WriteGradient( rOStm, maGradient ); } - - void MetaGradientAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2552,15 +2026,11 @@ void MetaGradientAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadGradient( rIStm, maGradient ); } - - MetaGradientExAction::MetaGradientExAction() : MetaAction ( META_GRADIENTEX_ACTION ) { } - - MetaGradientExAction::MetaGradientExAction( const PolyPolygon& rPolyPoly, const Gradient& rGradient ) : MetaAction ( META_GRADIENTEX_ACTION ), maPolyPoly ( rPolyPoly ), @@ -2568,14 +2038,10 @@ MetaGradientExAction::MetaGradientExAction( const PolyPolygon& rPolyPoly, const { } - - MetaGradientExAction::~MetaGradientExAction() { } - - void MetaGradientExAction::Execute( OutputDevice* pOut ) { if( pOut->GetConnectMetaFile() ) @@ -2585,8 +2051,6 @@ void MetaGradientExAction::Execute( OutputDevice* pOut ) } } - - MetaAction* MetaGradientExAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaGradientExAction( *this ); @@ -2594,31 +2058,23 @@ MetaAction* MetaGradientExAction::Clone() return pClone; } - - void MetaGradientExAction::Move( long nHorzMove, long nVertMove ) { maPolyPoly.Move( nHorzMove, nVertMove ); } - - void MetaGradientExAction::Scale( double fScaleX, double fScaleY ) { for( sal_uInt16 i = 0, nCount = maPolyPoly.Count(); i < nCount; i++ ) ImplScalePoly( maPolyPoly[ i ], fScaleX, fScaleY ); } - - bool MetaGradientExAction::Compare( const MetaAction& rMetaAction ) const { return ( maPolyPoly == ((MetaGradientExAction&)rMetaAction).maPolyPoly ) && ( maGradient == ((MetaGradientExAction&)rMetaAction).maGradient ); } - - void MetaGradientExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -2631,8 +2087,6 @@ void MetaGradientExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WriteGradient( rOStm, maGradient ); } - - void MetaGradientExAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2640,12 +2094,8 @@ void MetaGradientExAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadGradient( rIStm, maGradient ); } - - IMPL_META_ACTION( Hatch, META_HATCH_ACTION ) - - MetaHatchAction::MetaHatchAction( const PolyPolygon& rPolyPoly, const Hatch& rHatch ) : MetaAction ( META_HATCH_ACTION ), maPolyPoly ( rPolyPoly ), @@ -2653,15 +2103,11 @@ MetaHatchAction::MetaHatchAction( const PolyPolygon& rPolyPoly, const Hatch& rHa { } - - void MetaHatchAction::Execute( OutputDevice* pOut ) { pOut->DrawHatch( maPolyPoly, maHatch ); } - - MetaAction* MetaHatchAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaHatchAction( *this ); @@ -2669,31 +2115,23 @@ MetaAction* MetaHatchAction::Clone() return pClone; } - - void MetaHatchAction::Move( long nHorzMove, long nVertMove ) { maPolyPoly.Move( nHorzMove, nVertMove ); } - - void MetaHatchAction::Scale( double fScaleX, double fScaleY ) { for( sal_uInt16 i = 0, nCount = maPolyPoly.Count(); i < nCount; i++ ) ImplScalePoly( maPolyPoly[ i ], fScaleX, fScaleY ); } - - bool MetaHatchAction::Compare( const MetaAction& rMetaAction ) const { return ( maPolyPoly == ((MetaHatchAction&)rMetaAction).maPolyPoly ) && ( maHatch == ((MetaHatchAction&)rMetaAction).maHatch ); } - - void MetaHatchAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -2706,8 +2144,6 @@ void MetaHatchAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WriteHatch( rOStm, maHatch ); } - - void MetaHatchAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2715,12 +2151,8 @@ void MetaHatchAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadHatch( rIStm, maHatch ); } - - IMPL_META_ACTION( Wallpaper, META_WALLPAPER_ACTION ) - - MetaWallpaperAction::MetaWallpaperAction( const Rectangle& rRect, const Wallpaper& rPaper ) : MetaAction ( META_WALLPAPER_ACTION ), @@ -2729,15 +2161,11 @@ MetaWallpaperAction::MetaWallpaperAction( const Rectangle& rRect, { } - - void MetaWallpaperAction::Execute( OutputDevice* pOut ) { pOut->DrawWallpaper( maRect, maWallpaper ); } - - MetaAction* MetaWallpaperAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaWallpaperAction( *this ); @@ -2745,50 +2173,36 @@ MetaAction* MetaWallpaperAction::Clone() return pClone; } - - void MetaWallpaperAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); } - - void MetaWallpaperAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); } - - bool MetaWallpaperAction::Compare( const MetaAction& rMetaAction ) const { return ( maRect == ((MetaWallpaperAction&)rMetaAction).maRect ) && ( maWallpaper == ((MetaWallpaperAction&)rMetaAction).maWallpaper ); } - - void MetaWallpaperAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); WriteWallpaper( rOStm, maWallpaper ); } - - void MetaWallpaperAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadWallpaper( rIStm, maWallpaper ); } - - IMPL_META_ACTION( ClipRegion, META_CLIPREGION_ACTION ) - - MetaClipRegionAction::MetaClipRegionAction( const Region& rRegion, bool bClip ) : MetaAction ( META_CLIPREGION_ACTION ), maRegion ( rRegion ), @@ -2796,8 +2210,6 @@ MetaClipRegionAction::MetaClipRegionAction( const Region& rRegion, bool bClip ) { } - - void MetaClipRegionAction::Execute( OutputDevice* pOut ) { if( mbClip ) @@ -2806,8 +2218,6 @@ void MetaClipRegionAction::Execute( OutputDevice* pOut ) pOut->SetClipRegion(); } - - MetaAction* MetaClipRegionAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaClipRegionAction( *this ); @@ -2815,30 +2225,22 @@ MetaAction* MetaClipRegionAction::Clone() return pClone; } - - void MetaClipRegionAction::Move( long nHorzMove, long nVertMove ) { maRegion.Move( nHorzMove, nVertMove ); } - - void MetaClipRegionAction::Scale( double fScaleX, double fScaleY ) { maRegion.Scale( fScaleX, fScaleY ); } - - bool MetaClipRegionAction::Compare( const MetaAction& rMetaAction ) const { return ( maRegion == ((MetaClipRegionAction&)rMetaAction).maRegion ) && ( mbClip == ((MetaClipRegionAction&)rMetaAction).mbClip ); } - - void MetaClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -2846,8 +2248,6 @@ void MetaClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUChar( mbClip ); } - - void MetaClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2855,27 +2255,19 @@ void MetaClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbClip ); } - - IMPL_META_ACTION( ISectRectClipRegion, META_ISECTRECTCLIPREGION_ACTION ) - - MetaISectRectClipRegionAction::MetaISectRectClipRegionAction( const Rectangle& rRect ) : MetaAction ( META_ISECTRECTCLIPREGION_ACTION ), maRect ( rRect ) { } - - void MetaISectRectClipRegionAction::Execute( OutputDevice* pOut ) { pOut->IntersectClipRegion( maRect ); } - - MetaAction* MetaISectRectClipRegionAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaISectRectClipRegionAction( *this ); @@ -2883,64 +2275,46 @@ MetaAction* MetaISectRectClipRegionAction::Clone() return pClone; } - - void MetaISectRectClipRegionAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); } - - void MetaISectRectClipRegionAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); } - - bool MetaISectRectClipRegionAction::Compare( const MetaAction& rMetaAction ) const { return maRect == ((MetaISectRectClipRegionAction&)rMetaAction).maRect; } - - void MetaISectRectClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); WriteRectangle( rOStm, maRect ); } - - void MetaISectRectClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadRectangle( rIStm, maRect ); } - - IMPL_META_ACTION( ISectRegionClipRegion, META_ISECTREGIONCLIPREGION_ACTION ) - - MetaISectRegionClipRegionAction::MetaISectRegionClipRegionAction( const Region& rRegion ) : MetaAction ( META_ISECTREGIONCLIPREGION_ACTION ), maRegion ( rRegion ) { } - - void MetaISectRegionClipRegionAction::Execute( OutputDevice* pOut ) { pOut->IntersectClipRegion( maRegion ); } - - MetaAction* MetaISectRegionClipRegionAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaISectRegionClipRegionAction( *this ); @@ -2948,49 +2322,35 @@ MetaAction* MetaISectRegionClipRegionAction::Clone() return pClone; } - - void MetaISectRegionClipRegionAction::Move( long nHorzMove, long nVertMove ) { maRegion.Move( nHorzMove, nVertMove ); } - - void MetaISectRegionClipRegionAction::Scale( double fScaleX, double fScaleY ) { maRegion.Scale( fScaleX, fScaleY ); } - - bool MetaISectRegionClipRegionAction::Compare( const MetaAction& rMetaAction ) const { return maRegion == ((MetaISectRegionClipRegionAction&)rMetaAction).maRegion; } - - void MetaISectRegionClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); WriteRegion( rOStm, maRegion ); } - - void MetaISectRegionClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadRegion( rIStm, maRegion ); } - - IMPL_META_ACTION( MoveClipRegion, META_MOVECLIPREGION_ACTION ) - - MetaMoveClipRegionAction::MetaMoveClipRegionAction( long nHorzMove, long nVertMove ) : MetaAction ( META_MOVECLIPREGION_ACTION ), mnHorzMove ( nHorzMove ), @@ -2998,15 +2358,11 @@ MetaMoveClipRegionAction::MetaMoveClipRegionAction( long nHorzMove, long nVertMo { } - - void MetaMoveClipRegionAction::Execute( OutputDevice* pOut ) { pOut->MoveClipRegion( mnHorzMove, mnVertMove ); } - - MetaAction* MetaMoveClipRegionAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaMoveClipRegionAction( *this ); @@ -3014,24 +2370,18 @@ MetaAction* MetaMoveClipRegionAction::Clone() return pClone; } - - void MetaMoveClipRegionAction::Scale( double fScaleX, double fScaleY ) { mnHorzMove = FRound( mnHorzMove * fScaleX ); mnVertMove = FRound( mnVertMove * fScaleY ); } - - bool MetaMoveClipRegionAction::Compare( const MetaAction& rMetaAction ) const { return ( mnHorzMove == ((MetaMoveClipRegionAction&)rMetaAction).mnHorzMove ) && ( mnVertMove == ((MetaMoveClipRegionAction&)rMetaAction).mnVertMove ); } - - void MetaMoveClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3039,8 +2389,6 @@ void MetaMoveClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(mnHorzMove) ).WriteInt32( sal::static_int_cast<sal_Int32>(mnVertMove) ); } - - void MetaMoveClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -3051,12 +2399,8 @@ void MetaMoveClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) mnVertMove = nTmpVM; } - - IMPL_META_ACTION( LineColor, META_LINECOLOR_ACTION ) - - MetaLineColorAction::MetaLineColorAction( const Color& rColor, bool bSet ) : MetaAction ( META_LINECOLOR_ACTION ), maColor ( rColor ), @@ -3064,8 +2408,6 @@ MetaLineColorAction::MetaLineColorAction( const Color& rColor, bool bSet ) : { } - - void MetaLineColorAction::Execute( OutputDevice* pOut ) { if( mbSet ) @@ -3074,8 +2416,6 @@ void MetaLineColorAction::Execute( OutputDevice* pOut ) pOut->SetLineColor(); } - - MetaAction* MetaLineColorAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaLineColorAction( *this ); @@ -3083,16 +2423,12 @@ MetaAction* MetaLineColorAction::Clone() return pClone; } - - bool MetaLineColorAction::Compare( const MetaAction& rMetaAction ) const { return ( maColor == ((MetaLineColorAction&)rMetaAction).maColor ) && ( mbSet == ((MetaLineColorAction&)rMetaAction).mbSet ); } - - void MetaLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3100,8 +2436,6 @@ void MetaLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUChar( mbSet ); } - - void MetaLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -3109,12 +2443,8 @@ void MetaLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbSet ); } - - IMPL_META_ACTION( FillColor, META_FILLCOLOR_ACTION ) - - MetaFillColorAction::MetaFillColorAction( const Color& rColor, bool bSet ) : MetaAction ( META_FILLCOLOR_ACTION ), maColor ( rColor ), @@ -3122,8 +2452,6 @@ MetaFillColorAction::MetaFillColorAction( const Color& rColor, bool bSet ) : { } - - void MetaFillColorAction::Execute( OutputDevice* pOut ) { if( mbSet ) @@ -3132,8 +2460,6 @@ void MetaFillColorAction::Execute( OutputDevice* pOut ) pOut->SetFillColor(); } - - MetaAction* MetaFillColorAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaFillColorAction( *this ); @@ -3141,16 +2467,12 @@ MetaAction* MetaFillColorAction::Clone() return pClone; } - - bool MetaFillColorAction::Compare( const MetaAction& rMetaAction ) const { return ( maColor == ((MetaFillColorAction&)rMetaAction).maColor ) && ( mbSet == ((MetaFillColorAction&)rMetaAction).mbSet ); } - - void MetaFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3158,8 +2480,6 @@ void MetaFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUChar( mbSet ); } - - void MetaFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -3167,27 +2487,19 @@ void MetaFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbSet ); } - - IMPL_META_ACTION( TextColor, META_TEXTCOLOR_ACTION ) - - MetaTextColorAction::MetaTextColorAction( const Color& rColor ) : MetaAction ( META_TEXTCOLOR_ACTION ), maColor ( rColor ) { } - - void MetaTextColorAction::Execute( OutputDevice* pOut ) { pOut->SetTextColor( maColor ); } - - MetaAction* MetaTextColorAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaTextColorAction( *this ); @@ -3195,35 +2507,25 @@ MetaAction* MetaTextColorAction::Clone() return pClone; } - - bool MetaTextColorAction::Compare( const MetaAction& rMetaAction ) const { return maColor == ((MetaTextColorAction&)rMetaAction).maColor; } - - void MetaTextColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); maColor.Write( rOStm, true ); } - - void MetaTextColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); maColor.Read( rIStm, true ); } - - IMPL_META_ACTION( TextFillColor, META_TEXTFILLCOLOR_ACTION ) - - MetaTextFillColorAction::MetaTextFillColorAction( const Color& rColor, bool bSet ) : MetaAction ( META_TEXTFILLCOLOR_ACTION ), maColor ( rColor ), @@ -3231,8 +2533,6 @@ MetaTextFillColorAction::MetaTextFillColorAction( const Color& rColor, bool bSet { } - - void MetaTextFillColorAction::Execute( OutputDevice* pOut ) { if( mbSet ) @@ -3241,8 +2541,6 @@ void MetaTextFillColorAction::Execute( OutputDevice* pOut ) pOut->SetTextFillColor(); } - - MetaAction* MetaTextFillColorAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaTextFillColorAction( *this ); @@ -3250,16 +2548,12 @@ MetaAction* MetaTextFillColorAction::Clone() return pClone; } - - bool MetaTextFillColorAction::Compare( const MetaAction& rMetaAction ) const { return ( maColor == ((MetaTextFillColorAction&)rMetaAction).maColor ) && ( mbSet == ((MetaTextFillColorAction&)rMetaAction).mbSet ); } - - void MetaTextFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3267,8 +2561,6 @@ void MetaTextFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUChar( mbSet ); } - - void MetaTextFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -3276,12 +2568,8 @@ void MetaTextFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbSet ); } - - IMPL_META_ACTION( TextLineColor, META_TEXTLINECOLOR_ACTION ) - - MetaTextLineColorAction::MetaTextLineColorAction( const Color& rColor, bool bSet ) : MetaAction ( META_TEXTLINECOLOR_ACTION ), maColor ( rColor ), @@ -3289,8 +2577,6 @@ MetaTextLineColorAction::MetaTextLineColorAction( const Color& rColor, bool bSet { } - - void MetaTextLineColorAction::Execute( OutputDevice* pOut ) { if( mbSet ) @@ -3299,8 +2585,6 @@ void MetaTextLineColorAction::Execute( OutputDevice* pOut ) pOut->SetTextLineColor(); } - - MetaAction* MetaTextLineColorAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaTextLineColorAction( *this ); @@ -3308,16 +2592,12 @@ MetaAction* MetaTextLineColorAction::Clone() return pClone; } - - bool MetaTextLineColorAction::Compare( const MetaAction& rMetaAction ) const { return ( maColor == ((MetaTextLineColorAction&)rMetaAction).maColor ) && ( mbSet == ((MetaTextLineColorAction&)rMetaAction).mbSet ); } - - void MetaTextLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3325,8 +2605,6 @@ void MetaTextLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUChar( mbSet ); } - - void MetaTextLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -3334,12 +2612,8 @@ void MetaTextLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbSet ); } - - IMPL_META_ACTION( OverlineColor, META_OVERLINECOLOR_ACTION ) - - MetaOverlineColorAction::MetaOverlineColorAction( const Color& rColor, bool bSet ) : MetaAction ( META_OVERLINECOLOR_ACTION ), maColor ( rColor ), @@ -3347,8 +2621,6 @@ MetaOverlineColorAction::MetaOverlineColorAction( const Color& rColor, bool bSet { } - - void MetaOverlineColorAction::Execute( OutputDevice* pOut ) { if( mbSet ) @@ -3357,8 +2629,6 @@ void MetaOverlineColorAction::Execute( OutputDevice* pOut ) pOut->SetOverlineColor(); } - - MetaAction* MetaOverlineColorAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaOverlineColorAction( *this ); @@ -3366,16 +2636,12 @@ MetaAction* MetaOverlineColorAction::Clone() return pClone; } - - bool MetaOverlineColorAction::Compare( const MetaAction& rMetaAction ) const { return ( maColor == ((MetaOverlineColorAction&)rMetaAction).maColor ) && ( mbSet == ((MetaOverlineColorAction&)rMetaAction).mbSet ); } - - void MetaOverlineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3383,8 +2649,6 @@ void MetaOverlineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUChar( mbSet ); } - - void MetaOverlineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -3392,27 +2656,19 @@ void MetaOverlineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbSet ); } - - IMPL_META_ACTION( TextAlign, META_TEXTALIGN_ACTION ) - - MetaTextAlignAction::MetaTextAlignAction( TextAlign aAlign ) : MetaAction ( META_TEXTALIGN_ACTION ), maAlign ( aAlign ) { } - - void MetaTextAlignAction::Execute( OutputDevice* pOut ) { pOut->SetTextAlign( maAlign ); } - - MetaAction* MetaTextAlignAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaTextAlignAction( *this ); @@ -3420,23 +2676,17 @@ MetaAction* MetaTextAlignAction::Clone() return pClone; } - - bool MetaTextAlignAction::Compare( const MetaAction& rMetaAction ) const { return maAlign == ((MetaTextAlignAction&)rMetaAction).maAlign; } - - void MetaTextAlignAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); rOStm.WriteUInt16( (sal_uInt16) maAlign ); } - - void MetaTextAlignAction::Read( SvStream& rIStm, ImplMetaReadData* ) { sal_uInt16 nTmp16(0); @@ -3445,27 +2695,19 @@ void MetaTextAlignAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadUInt16( nTmp16 ); maAlign = (TextAlign) nTmp16; } - - IMPL_META_ACTION( MapMode, META_MAPMODE_ACTION ) - - MetaMapModeAction::MetaMapModeAction( const MapMode& rMapMode ) : MetaAction ( META_MAPMODE_ACTION ), maMapMode ( rMapMode ) { } - - void MetaMapModeAction::Execute( OutputDevice* pOut ) { pOut->SetMapMode( maMapMode ); } - - MetaAction* MetaMapModeAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaMapModeAction( *this ); @@ -3473,8 +2715,6 @@ MetaAction* MetaMapModeAction::Clone() return pClone; } - - void MetaMapModeAction::Scale( double fScaleX, double fScaleY ) { Point aPoint( maMapMode.GetOrigin() ); @@ -3483,35 +2723,25 @@ void MetaMapModeAction::Scale( double fScaleX, double fScaleY ) maMapMode.SetOrigin( aPoint ); } - - bool MetaMapModeAction::Compare( const MetaAction& rMetaAction ) const { return maMapMode == ((MetaMapModeAction&)rMetaAction).maMapMode; } - - void MetaMapModeAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); WriteMapMode( rOStm, maMapMode ); } - - void MetaMapModeAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadMapMode( rIStm, maMapMode ); } - - IMPL_META_ACTION( Font, META_FONT_ACTION ) - - MetaFontAction::MetaFontAction( const Font& rFont ) : MetaAction ( META_FONT_ACTION ), maFont ( rFont ) @@ -3527,15 +2757,11 @@ MetaFontAction::MetaFontAction( const Font& rFont ) : } } - - void MetaFontAction::Execute( OutputDevice* pOut ) { pOut->SetFont( maFont ); } - - MetaAction* MetaFontAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaFontAction( *this ); @@ -3543,8 +2769,6 @@ MetaAction* MetaFontAction::Clone() return pClone; } - - void MetaFontAction::Scale( double fScaleX, double fScaleY ) { const Size aSize( @@ -3553,15 +2777,11 @@ void MetaFontAction::Scale( double fScaleX, double fScaleY ) maFont.SetSize( aSize ); } - - bool MetaFontAction::Compare( const MetaAction& rMetaAction ) const { return maFont == ((MetaFontAction&)rMetaAction).maFont; } - - void MetaFontAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3571,8 +2791,6 @@ void MetaFontAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) pData->meActualCharSet = osl_getThreadTextEncoding(); } - - void MetaFontAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); @@ -3582,27 +2800,19 @@ void MetaFontAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) pData->meActualCharSet = osl_getThreadTextEncoding(); } - - IMPL_META_ACTION( Push, META_PUSH_ACTION ) - - MetaPushAction::MetaPushAction( sal_uInt16 nFlags ) : MetaAction ( META_PUSH_ACTION ), mnFlags ( nFlags ) { } - - void MetaPushAction::Execute( OutputDevice* pOut ) { pOut->Push( mnFlags ); } - - MetaAction* MetaPushAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaPushAction( *this ); @@ -3610,42 +2820,30 @@ MetaAction* MetaPushAction::Clone() return pClone; } - - bool MetaPushAction::Compare( const MetaAction& rMetaAction ) const { return mnFlags == ((MetaPushAction&)rMetaAction).mnFlags; } - - void MetaPushAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); rOStm.WriteUInt16( mnFlags ); } - - void MetaPushAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); rIStm.ReadUInt16( mnFlags ); } - - IMPL_META_ACTION( Pop, META_POP_ACTION ) - - void MetaPopAction::Execute( OutputDevice* pOut ) { pOut->Pop(); } - - MetaAction* MetaPopAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaPopAction( *this ); @@ -3653,41 +2851,29 @@ MetaAction* MetaPopAction::Clone() return pClone; } - - void MetaPopAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); } - - void MetaPopAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); } - - IMPL_META_ACTION( RasterOp, META_RASTEROP_ACTION ) - - MetaRasterOpAction::MetaRasterOpAction( RasterOp eRasterOp ) : MetaAction ( META_RASTEROP_ACTION ), meRasterOp ( eRasterOp ) { } - - void MetaRasterOpAction::Execute( OutputDevice* pOut ) { pOut->SetRasterOp( meRasterOp ); } - - MetaAction* MetaRasterOpAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaRasterOpAction( *this ); @@ -3695,23 +2881,17 @@ MetaAction* MetaRasterOpAction::Clone() return pClone; } - - bool MetaRasterOpAction::Compare( const MetaAction& rMetaAction ) const { return meRasterOp == ((MetaRasterOpAction&)rMetaAction).meRasterOp; } - - void MetaRasterOpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); rOStm.WriteUInt16( (sal_uInt16) meRasterOp ); } - - void MetaRasterOpAction::Read( SvStream& rIStm, ImplMetaReadData* ) { sal_uInt16 nTmp16(0); @@ -3720,12 +2900,8 @@ void MetaRasterOpAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadUInt16( nTmp16 ); meRasterOp = (RasterOp) nTmp16; } - - IMPL_META_ACTION( Transparent, META_TRANSPARENT_ACTION ) - - MetaTransparentAction::MetaTransparentAction( const PolyPolygon& rPolyPoly, sal_uInt16 nTransPercent ) : MetaAction ( META_TRANSPARENT_ACTION ), maPolyPoly ( rPolyPoly ), @@ -3733,15 +2909,11 @@ MetaTransparentAction::MetaTransparentAction( const PolyPolygon& rPolyPoly, sal_ { } - - void MetaTransparentAction::Execute( OutputDevice* pOut ) { pOut->DrawTransparent( maPolyPoly, mnTransPercent ); } - - MetaAction* MetaTransparentAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaTransparentAction( *this ); @@ -3749,31 +2921,23 @@ MetaAction* MetaTransparentAction::Clone() return pClone; } - - void MetaTransparentAction::Move( long nHorzMove, long nVertMove ) { maPolyPoly.Move( nHorzMove, nVertMove ); } - - void MetaTransparentAction::Scale( double fScaleX, double fScaleY ) { for( sal_uInt16 i = 0, nCount = maPolyPoly.Count(); i < nCount; i++ ) ImplScalePoly( maPolyPoly[ i ], fScaleX, fScaleY ); } - - bool MetaTransparentAction::Compare( const MetaAction& rMetaAction ) const { return ( maPolyPoly == ((MetaTransparentAction&)rMetaAction).maPolyPoly ) && ( mnTransPercent == ((MetaTransparentAction&)rMetaAction).mnTransPercent ); } - - void MetaTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3794,8 +2958,6 @@ void MetaTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUInt16( mnTransPercent ); } - - void MetaTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -3803,12 +2965,8 @@ void MetaTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadUInt16( mnTransPercent ); } - - IMPL_META_ACTION( FloatTransparent, META_FLOATTRANSPARENT_ACTION ) - - MetaFloatTransparentAction::MetaFloatTransparentAction( const GDIMetaFile& rMtf, const Point& rPos, const Size& rSize, const Gradient& rGradient ) : MetaAction ( META_FLOATTRANSPARENT_ACTION ), @@ -3819,15 +2977,11 @@ MetaFloatTransparentAction::MetaFloatTransparentAction( const GDIMetaFile& rMtf, { } - - void MetaFloatTransparentAction::Execute( OutputDevice* pOut ) { pOut->DrawTransparent( maMtf, maPoint, maSize, maGradient ); } - - MetaAction* MetaFloatTransparentAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaFloatTransparentAction( *this ); @@ -3835,15 +2989,11 @@ MetaAction* MetaFloatTransparentAction::Clone() return pClone; } - - void MetaFloatTransparentAction::Move( long nHorzMove, long nVertMove ) { maPoint.Move( nHorzMove, nVertMove ); } - - void MetaFloatTransparentAction::Scale( double fScaleX, double fScaleY ) { Rectangle aRectangle(maPoint, maSize); @@ -3852,8 +3002,6 @@ void MetaFloatTransparentAction::Scale( double fScaleX, double fScaleY ) maSize = aRectangle.GetSize(); } - - bool MetaFloatTransparentAction::Compare( const MetaAction& rMetaAction ) const { return ( maMtf == ((MetaFloatTransparentAction&)rMetaAction).maMtf ) && @@ -3862,8 +3010,6 @@ bool MetaFloatTransparentAction::Compare( const MetaAction& rMetaAction ) const ( maGradient == ((MetaFloatTransparentAction&)rMetaAction).maGradient ); } - - void MetaFloatTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3874,8 +3020,6 @@ void MetaFloatTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pDat WriteGradient( rOStm, maGradient ); } - - void MetaFloatTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -3885,12 +3029,8 @@ void MetaFloatTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadGradient( rIStm, maGradient ); } - - IMPL_META_ACTION( EPS, META_EPS_ACTION ) - - MetaEPSAction::MetaEPSAction( const Point& rPoint, const Size& rSize, const GfxLink& rGfxLink, const GDIMetaFile& rSubst ) : MetaAction ( META_EPS_ACTION ), @@ -3901,15 +3041,11 @@ MetaEPSAction::MetaEPSAction( const Point& rPoint, const Size& rSize, { } - - void MetaEPSAction::Execute( OutputDevice* pOut ) { pOut->DrawEPS( maPoint, maSize, maGfxLink, &maSubst ); } - - MetaAction* MetaEPSAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaEPSAction( *this ); @@ -3917,15 +3053,11 @@ MetaAction* MetaEPSAction::Clone() return pClone; } - - void MetaEPSAction::Move( long nHorzMove, long nVertMove ) { maPoint.Move( nHorzMove, nVertMove ); } - - void MetaEPSAction::Scale( double fScaleX, double fScaleY ) { Rectangle aRectangle(maPoint, maSize); @@ -3934,8 +3066,6 @@ void MetaEPSAction::Scale( double fScaleX, double fScaleY ) maSize = aRectangle.GetSize(); } - - bool MetaEPSAction::Compare( const MetaAction& rMetaAction ) const { return ( maGfxLink.IsEqual(((MetaEPSAction&)rMetaAction).maGfxLink )) && @@ -3944,8 +3074,6 @@ bool MetaEPSAction::Compare( const MetaAction& rMetaAction ) const ( maSize == ((MetaEPSAction&)rMetaAction).maSize ); } - - void MetaEPSAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3955,8 +3083,6 @@ void MetaEPSAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) maSubst.Write( rOStm ); } - - void MetaEPSAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -3966,12 +3092,8 @@ void MetaEPSAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadGDIMetaFile( rIStm, maSubst ); } - - IMPL_META_ACTION( RefPoint, META_REFPOINT_ACTION ) - - MetaRefPointAction::MetaRefPointAction( const Point& rRefPoint, bool bSet ) : MetaAction ( META_REFPOINT_ACTION ), maRefPoint ( rRefPoint ), @@ -3979,8 +3101,6 @@ MetaRefPointAction::MetaRefPointAction( const Point& rRefPoint, bool bSet ) : { } - - void MetaRefPointAction::Execute( OutputDevice* pOut ) { if( mbSet ) @@ -3989,8 +3109,6 @@ void MetaRefPointAction::Execute( OutputDevice* pOut ) pOut->SetRefPoint(); } - - MetaAction* MetaRefPointAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaRefPointAction( *this ); @@ -3998,16 +3116,12 @@ MetaAction* MetaRefPointAction::Clone() return pClone; } - - bool MetaRefPointAction::Compare( const MetaAction& rMetaAction ) const { return ( maRefPoint == ((MetaRefPointAction&)rMetaAction).maRefPoint ) && ( mbSet == ((MetaRefPointAction&)rMetaAction).mbSet ); } - - void MetaRefPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -4015,16 +3129,12 @@ void MetaRefPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUChar( mbSet ); } - - void MetaRefPointAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadPair( rIStm, maRefPoint ).ReadCharAsBool( mbSet ); } - - MetaCommentAction::MetaCommentAction( sal_Int32 nValue ) : MetaAction ( META_COMMENT_ACTION ), mnValue ( nValue ) @@ -4032,8 +3142,6 @@ MetaCommentAction::MetaCommentAction( sal_Int32 nValue ) : ImplInitDynamicData( NULL, 0UL ); } - - MetaCommentAction::MetaCommentAction( const MetaCommentAction& rAct ) : MetaAction ( META_COMMENT_ACTION ), maComment ( rAct.maComment ), @@ -4042,8 +3150,6 @@ MetaCommentAction::MetaCommentAction( const MetaCommentAction& rAct ) : ImplInitDynamicData( rAct.mpData, rAct.mnDataSize ); } - - MetaCommentAction::MetaCommentAction( const OString& rComment, sal_Int32 nValue, const sal_uInt8* pData, sal_uInt32 nDataSize ) : MetaAction ( META_COMMENT_ACTION ), maComment ( rComment ), @@ -4052,16 +3158,12 @@ MetaCommentAction::MetaCommentAction( const OString& rComment, sal_Int32 nValue, ImplInitDynamicData( pData, nDataSize ); } - - MetaCommentAction::~MetaCommentAction() { if ( mpData ) delete[] mpData; } - - void MetaCommentAction::ImplInitDynamicData( const sal_uInt8* pData, sal_uInt32 nDataSize ) { if ( nDataSize && pData ) @@ -4076,8 +3178,6 @@ void MetaCommentAction::ImplInitDynamicData( const sal_uInt8* pData, sal_uInt32 } } - - void MetaCommentAction::Execute( OutputDevice* pOut ) { if ( pOut->GetConnectMetaFile() ) @@ -4087,8 +3187,6 @@ void MetaCommentAction::Execute( OutputDevice* pOut ) } } - - MetaAction* MetaCommentAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaCommentAction( *this ); @@ -4148,7 +3246,6 @@ void MetaCommentAction::Move( long nXMove, long nYMove ) } } - // SJ: 25.07.06 #i56656# we are not able to mirrorcertain kind of // comments properly, especially the XPATHSTROKE and XPATHFILL lead to // problems, so it is better to remove these comments when mirroring @@ -4214,8 +3311,6 @@ void MetaCommentAction::Scale( double fXScale, double fYScale ) } } - - bool MetaCommentAction::Compare( const MetaAction& rMetaAction ) const { return ( maComment == ((MetaCommentAction&)rMetaAction).maComment ) && @@ -4224,8 +3319,6 @@ bool MetaCommentAction::Compare( const MetaAction& rMetaAction ) const ( memcmp( mpData, ((MetaCommentAction&)rMetaAction).mpData, mnDataSize ) == 0 ); } - - void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -4236,8 +3329,6 @@ void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.Write( mpData, mnDataSize ); } - - void MetaCommentAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -4257,27 +3348,19 @@ void MetaCommentAction::Read( SvStream& rIStm, ImplMetaReadData* ) mpData = NULL; } - - IMPL_META_ACTION( LayoutMode, META_LAYOUTMODE_ACTION ) - - MetaLayoutModeAction::MetaLayoutModeAction( sal_uInt32 nLayoutMode ) : MetaAction ( META_LAYOUTMODE_ACTION ), mnLayoutMode( nLayoutMode ) { } - - void MetaLayoutModeAction::Execute( OutputDevice* pOut ) { pOut->SetLayoutMode( mnLayoutMode ); } - - MetaAction* MetaLayoutModeAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaLayoutModeAction( *this ); @@ -4285,50 +3368,36 @@ MetaAction* MetaLayoutModeAction::Clone() return pClone; } - - bool MetaLayoutModeAction::Compare( const MetaAction& rMetaAction ) const { return mnLayoutMode == ((MetaLayoutModeAction&)rMetaAction).mnLayoutMode; } - - void MetaLayoutModeAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); rOStm.WriteUInt32( mnLayoutMode ); } - - void MetaLayoutModeAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); rIStm.ReadUInt32( mnLayoutMode ); } - - IMPL_META_ACTION( TextLanguage, META_TEXTLANGUAGE_ACTION ) - - MetaTextLanguageAction::MetaTextLanguageAction( LanguageType eTextLanguage ) : MetaAction ( META_TEXTLANGUAGE_ACTION ), meTextLanguage( eTextLanguage ) { } - - void MetaTextLanguageAction::Execute( OutputDevice* pOut ) { pOut->SetDigitLanguage( meTextLanguage ); } - - MetaAction* MetaTextLanguageAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaTextLanguageAction( *this ); @@ -4336,23 +3405,17 @@ MetaAction* MetaTextLanguageAction::Clone() return pClone; } - - bool MetaTextLanguageAction::Compare( const MetaAction& rMetaAction ) const { return meTextLanguage == ((MetaTextLanguageAction&)rMetaAction).meTextLanguage; } - - void MetaTextLanguageAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); rOStm.WriteUInt16( meTextLanguage ); } - - void MetaTextLanguageAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); diff --git a/vcl/source/gdi/metric.cxx b/vcl/source/gdi/metric.cxx index b1b0e8b568ac..f4b786c044b9 100644 --- a/vcl/source/gdi/metric.cxx +++ b/vcl/source/gdi/metric.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <impfont.hxx> #include <vcl/metric.hxx> @@ -26,8 +25,6 @@ #include <cstdio> - - ImplFontMetric::ImplFontMetric() : mnAscent( 0 ), mnDescent( 0 ), @@ -39,16 +36,12 @@ ImplFontMetric::ImplFontMetric() mnRefCount( 1 ) {} - - inline void ImplFontMetric::AddReference() { // TODO: disable refcounting on the default maps? ++mnRefCount; } - - inline void ImplFontMetric::DeReference() { // TODO: disable refcounting on the default maps? @@ -56,8 +49,6 @@ inline void ImplFontMetric::DeReference() delete this; } - - bool ImplFontMetric::operator==( const ImplFontMetric& r ) const { if( mnMiscFlags != r.mnMiscFlags ) @@ -76,14 +67,10 @@ bool ImplFontMetric::operator==( const ImplFontMetric& r ) const return true; } - - FontInfo::FontInfo() : mpImplMetric( new ImplFontMetric ) {} - - FontInfo::FontInfo( const FontInfo& rInfo ) : Font( rInfo ) { @@ -91,15 +78,11 @@ FontInfo::FontInfo( const FontInfo& rInfo ) mpImplMetric->AddReference(); } - - FontInfo::~FontInfo() { mpImplMetric->DeReference(); } - - FontInfo& FontInfo::operator=( const FontInfo& rInfo ) { Font::operator=( rInfo ); @@ -114,8 +97,6 @@ FontInfo& FontInfo::operator=( const FontInfo& rInfo ) return *this; } - - bool FontInfo::operator==( const FontInfo& rInfo ) const { if( !Font::operator==( rInfo ) ) @@ -127,8 +108,6 @@ bool FontInfo::operator==( const FontInfo& rInfo ) const return false; } - - FontType FontInfo::GetType() const { return (mpImplMetric->IsScalable() ? TYPE_SCALABLE : TYPE_RASTER); @@ -138,63 +117,45 @@ FontMetric::FontMetric( const FontMetric& rMetric ) : FontInfo( rMetric ) {} - - long FontMetric::GetAscent() const { return mpImplMetric->GetAscent(); } - - long FontMetric::GetDescent() const { return mpImplMetric->GetDescent(); } - - long FontMetric::GetIntLeading() const { return mpImplMetric->GetIntLeading(); } - - long FontMetric::GetExtLeading() const { return mpImplMetric->GetExtLeading(); } - - long FontMetric::GetLineHeight() const { return mpImplMetric->GetLineHeight(); } - - long FontMetric::GetSlant() const { return mpImplMetric->GetSlant(); } - - FontMetric& FontMetric::operator =( const FontMetric& rMetric ) { FontInfo::operator=( rMetric ); return *this; } - - bool FontMetric::operator==( const FontMetric& rMetric ) const { return FontInfo::operator==( rMetric ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/octree.cxx b/vcl/source/gdi/octree.cxx index 4e7222cdb2f5..21c0a4265e90 100644 --- a/vcl/source/gdi/octree.cxx +++ b/vcl/source/gdi/octree.cxx @@ -25,16 +25,12 @@ #include "octree.hxx" - // - pMask - - static const sal_uInt8 pImplMask[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }; - // - NodeCache - - ImpNodeCache::ImpNodeCache( const sal_uLong nInitSize ) : pActNode( NULL ) { @@ -49,8 +45,6 @@ ImpNodeCache::ImpNodeCache( const sal_uLong nInitSize ) : } } - - ImpNodeCache::~ImpNodeCache() { while( pActNode ) @@ -62,10 +56,8 @@ ImpNodeCache::~ImpNodeCache() } } - // - Octree - - Octree::Octree( const BitmapReadAccess& rReadAcc, sal_uLong nColors ) : nMax ( nColors ), nLeafCount ( 0L ), @@ -77,16 +69,12 @@ Octree::Octree( const BitmapReadAccess& rReadAcc, sal_uLong nColors ) : ImplCreateOctree(); } - - Octree::~Octree() { ImplDeleteOctree( &pTree ); delete pNodeCache; } - - void Octree::ImplCreateOctree() { if( !!*pAcc ) @@ -131,8 +119,6 @@ void Octree::ImplCreateOctree() } } - - void Octree::ImplDeleteOctree( PPNODE ppNode ) { for ( sal_uLong i = 0UL; i < 8UL; i++ ) @@ -145,8 +131,6 @@ void Octree::ImplDeleteOctree( PPNODE ppNode ) *ppNode = NULL; } - - void Octree::ImplAdd( PPNODE ppNode ) { // ggf. neuen Knoten erzeugen @@ -184,8 +168,6 @@ void Octree::ImplAdd( PPNODE ppNode ) } } - - void Octree::ImplReduce() { sal_uLong i; @@ -224,8 +206,6 @@ void Octree::ImplReduce() nLeafCount -= --nChildren; } - - void Octree::CreatePalette( PNODE pNode ) { if( pNode->bLeaf ) @@ -241,8 +221,6 @@ void Octree::CreatePalette( PNODE pNode ) } - - void Octree::GetPalIndex( PNODE pNode ) { if ( pNode->bLeaf ) @@ -259,10 +237,8 @@ void Octree::GetPalIndex( PNODE pNode ) } } - // - InverseColorMap - - InverseColorMap::InverseColorMap( const BitmapPalette& rPal ) : nBits( 8 - OCTREE_BITS ) { @@ -315,16 +291,12 @@ InverseColorMap::InverseColorMap( const BitmapPalette& rPal ) : } } - - InverseColorMap::~InverseColorMap() { rtl_freeMemory( pBuffer ); rtl_freeMemory( pMap ); } - - void InverseColorMap::ImplCreateBuffers( const sal_uLong nMax ) { const sal_uLong nCount = nMax * nMax * nMax; diff --git a/vcl/source/gdi/oldprintadaptor.cxx b/vcl/source/gdi/oldprintadaptor.cxx index 9ac3839b9238..3270f75bcdfe 100644 --- a/vcl/source/gdi/oldprintadaptor.cxx +++ b/vcl/source/gdi/oldprintadaptor.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/oldprintadaptor.hxx" #include "vcl/gdimtf.hxx" diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx index 2b7a088d0d6c..1ee437b962dc 100644 --- a/vcl/source/gdi/outdev.cxx +++ b/vcl/source/gdi/outdev.cxx @@ -955,7 +955,6 @@ Color OutputDevice::ImplDrawModeToColor( const Color& rColor ) const return aColor; } - void OutputDevice::SetLineColor( const Color& rColor ) { diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 6e22bd3ad52d..c2825d89bc6b 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -95,8 +95,6 @@ #include <memory> #include <algorithm> - - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::rtl; @@ -645,7 +643,6 @@ Font OutputDevice::GetDefaultFont( sal_uInt16 nType, LanguageType eLang, return aFont; } - ImplFontEntry::ImplFontEntry( const FontSelectPattern& rFontSelData ) : maFontSelData( rFontSelData ) , maMetric( rFontSelData ) @@ -704,7 +701,6 @@ void ImplFontEntry::IgnoreFallbackForUnicode( sal_UCS4 cChar, FontWeight eWeight mpUnicodeFallbackList->erase( it ); } - FontSelectPatternAttributes::FontSelectPatternAttributes( const Font& rFont, const OUString& rSearchName, const Size& rSize, float fExactHeight ) : maSearchName( rSearchName ) @@ -1120,7 +1116,6 @@ ImplMultiTextLineInfo::ImplMultiTextLineInfo() mnSize = MULTITEXTLINEINFO_RESIZE; } - ImplMultiTextLineInfo::~ImplMultiTextLineInfo() { for( sal_Int32 i = 0; i < mnLines; i++ ) @@ -3749,7 +3744,6 @@ void OutputDevice::DrawText( const Point& rStartPt, const OUString& rStr, pDisplayText = &mpOutDevData->mpRecordLayout->m_aDisplayText; } - #if OSL_DEBUG_LEVEL > 2 fprintf( stderr, " OutputDevice::DrawText(\"%s\")\n", OUStringToOString( rStr, RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -4606,7 +4600,6 @@ void OutputDevice::ImplDrawText( OutputDevice& rTargetDevice, const Rectangle& r aPos.X() = rRect.Left(); } - // If there still is a last line, we output it left-aligned as the line would be clipped if ( !aLastLine.isEmpty() ) _rLayout.DrawText( aPos, aLastLine, 0, aLastLine.getLength(), pVector, pDisplayText ); @@ -4744,7 +4737,6 @@ void OutputDevice::DrawText( const Rectangle& rRect, const OUString& rOrigStr, s pDisplayText = &mpOutDevData->mpRecordLayout->m_aDisplayText; } - bool bDecomposeTextRectAction = ( _pTextLayout != NULL ) && _pTextLayout->DecomposeTextRectAction(); if ( mpMetaFile && !bDecomposeTextRectAction ) mpMetaFile->AddAction( new MetaTextRectAction( rRect, rOrigStr, nStyle ) ); @@ -5963,7 +5955,6 @@ bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector, } } - // ignore "empty" glyphs: if( aPolyPoly.Count() > 0 ) { diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx index 0810e6b32f66..a8dc07d1a65e 100644 --- a/vcl/source/gdi/outdev4.cxx +++ b/vcl/source/gdi/outdev4.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/debug.hxx> #include <tools/line.hxx> #include <tools/poly.hxx> @@ -59,7 +58,6 @@ extern "C" int SAL_CALL ImplHatchCmpFnc( const void* p1, const void* p2 ) return ( nX1 > nX2 ? 1 : nX1 == nX2 ? nY1 > nY2 ? 1: nY1 == nY2 ? 0 : -1 : -1 ); } - void OutputDevice::ImplDrawPolygon( const Polygon& rPoly, const PolyPolygon* pClipPolyPoly ) { if( pClipPolyPoly ) diff --git a/vcl/source/gdi/outdev5.cxx b/vcl/source/gdi/outdev5.cxx index 5e6fa7f8fa3b..f16beae8ad95 100644 --- a/vcl/source/gdi/outdev5.cxx +++ b/vcl/source/gdi/outdev5.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/debug.hxx> #include <tools/poly.hxx> @@ -31,11 +30,6 @@ #include <outdata.hxx> #include <outdev.h> - - - - - void OutputDevice::DrawRect( const Rectangle& rRect, sal_uLong nHorzRound, sal_uLong nVertRound ) { @@ -92,8 +86,6 @@ void OutputDevice::DrawRect( const Rectangle& rRect, mpAlphaVDev->DrawRect( rRect, nHorzRound, nVertRound ); } - - void OutputDevice::DrawEllipse( const Rectangle& rRect ) { @@ -140,8 +132,6 @@ void OutputDevice::DrawEllipse( const Rectangle& rRect ) mpAlphaVDev->DrawEllipse( rRect ); } - - void OutputDevice::DrawArc( const Rectangle& rRect, const Point& rStartPt, const Point& rEndPt ) { @@ -185,8 +175,6 @@ void OutputDevice::DrawArc( const Rectangle& rRect, mpAlphaVDev->DrawArc( rRect, rStartPt, rEndPt ); } - - void OutputDevice::DrawPie( const Rectangle& rRect, const Point& rStartPt, const Point& rEndPt ) { @@ -237,8 +225,6 @@ void OutputDevice::DrawPie( const Rectangle& rRect, mpAlphaVDev->DrawPie( rRect, rStartPt, rEndPt ); } - - void OutputDevice::DrawChord( const Rectangle& rRect, const Point& rStartPt, const Point& rEndPt ) { diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx index ea606450fea3..49a51bf2000c 100644 --- a/vcl/source/gdi/outdev6.cxx +++ b/vcl/source/gdi/outdev6.cxx @@ -176,7 +176,6 @@ void OutputDevice::DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uLon mpAlphaVDev->DrawGrid( rRect, rDist, nFlags ); } - // Caution: This method is nearly the same as // void OutputDevice::DrawPolyPolygon( const basegfx::B2DPolyPolygon& rB2DPolyPoly ) // so when changes are made here do not forget to make changes there, too @@ -593,8 +592,6 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly, } } - - void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos, const Size& rSize, const Gradient& rTransparenceGradient ) { @@ -746,8 +743,6 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos, } } - - void OutputDevice::ImplDrawColorWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper ) @@ -765,8 +760,6 @@ void OutputDevice::ImplDrawColorWallpaper( long nX, long nY, EnableMapMode( bMap ); } - - void OutputDevice::ImplDrawBitmapWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper ) @@ -1008,8 +1001,6 @@ void OutputDevice::ImplDrawBitmapWallpaper( long nX, long nY, mpMetaFile = pOldMetaFile; } - - void OutputDevice::ImplDrawGradientWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper ) @@ -1053,8 +1044,6 @@ void OutputDevice::ImplDrawGradientWallpaper( long nX, long nY, mpMetaFile = pOldMetaFile; } - - void OutputDevice::ImplDrawWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper ) @@ -1067,8 +1056,6 @@ void OutputDevice::ImplDrawWallpaper( long nX, long nY, ImplDrawColorWallpaper( nX, nY, nWidth, nHeight, rWallpaper ); } - - void OutputDevice::DrawWallpaper( const Rectangle& rRect, const Wallpaper& rWallpaper ) { @@ -1094,8 +1081,6 @@ void OutputDevice::DrawWallpaper( const Rectangle& rRect, mpAlphaVDev->DrawWallpaper( rRect, rWallpaper ); } - - void OutputDevice::Erase() { if ( !IsDeviceOutputNecessary() || ImplIsRecordLayout() ) @@ -1134,8 +1119,6 @@ void OutputDevice::Erase() mpAlphaVDev->Erase(); } - - bool OutputDevice::DrawEPS( const Point& rPoint, const Size& rSize, const GfxLink& rGfxLink, GDIMetaFile* pSubst ) { @@ -1192,8 +1175,6 @@ bool OutputDevice::DrawEPS( const Point& rPoint, const Size& rSize, return bDrawn; } - - void OutputDevice::DrawCheckered(const Point& rPos, const Size& rSize, sal_uInt32 nLen, Color aStart, Color aEnd) { const sal_uInt32 nMaxX(rPos.X() + rSize.Width()); diff --git a/vcl/source/gdi/outdevnative.cxx b/vcl/source/gdi/outdevnative.cxx index bef50d8d4ec1..e521ae7524a8 100644 --- a/vcl/source/gdi/outdevnative.cxx +++ b/vcl/source/gdi/outdevnative.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/outdev.hxx" #include "vcl/window.hxx" #include "vcl/salnativewidgets.hxx" @@ -25,8 +24,6 @@ #include "salgdi.hxx" - - static bool lcl_enableNativeWidget( const OutputDevice& i_rDevice ) { const OutDevType eType( i_rDevice.GetOutDevType() ); @@ -140,13 +137,9 @@ PushButtonValue* PushButtonValue::clone() const return new PushButtonValue( *this ); } - // These functions are mainly passthrough functions that allow access to // the SalFrame behind a Window object for native widget rendering purposes. - - - bool OutputDevice::IsNativeControlSupported( ControlType nType, ControlPart nPart ) const { if( !lcl_enableNativeWidget( *this ) ) @@ -159,9 +152,6 @@ bool OutputDevice::IsNativeControlSupported( ControlType nType, ControlPart nPar return( mpGraphics->IsNativeControlSupported(nType, nPart) ); } - - - bool OutputDevice::HitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, @@ -183,8 +173,6 @@ bool OutputDevice::HitTestNativeControl( ControlType nType, rIsInside, this ) ); } - - static boost::shared_ptr< ImplControlValue > lcl_transformControlValue( const ImplControlValue& rVal, const OutputDevice& rDev ) { boost::shared_ptr< ImplControlValue > aResult; @@ -303,8 +291,6 @@ bool OutputDevice::DrawNativeControl( ControlType nType, return bRet; } - - bool OutputDevice::GetNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, @@ -339,5 +325,4 @@ bool OutputDevice::GetNativeControlRegion( ControlType nType, return bRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx index 57146b4ed212..1d5ffdbe9b90 100644 --- a/vcl/source/gdi/outmap.cxx +++ b/vcl/source/gdi/outmap.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <limits.h> #include <tools/bigint.hxx> @@ -42,19 +41,12 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> - - - - - static int const s_ImplArySize = MAP_PIXEL+1; static const long aImplNumeratorAry[s_ImplArySize] = { 1, 1, 5, 50, 1, 1, 1, 1, 1, 1, 1 }; static const long aImplDenominatorAry[s_ImplArySize] = { 2540, 254, 127, 127, 1000, 100, 10, 1, 72, 1440, 1 }; - - /* Reduces accuracy until it is a fraction (should become ctor fraction once); we could also do this with BigInts @@ -97,8 +89,6 @@ static Fraction ImplMakeFraction( long nN1, long nN2, long nD1, long nD2 ) return aF; } - - // Fraction.GetNumerator() // Fraction.GetDenominator() > 0 // rOutRes.nPixPerInch? > 0 @@ -165,8 +155,6 @@ static void ImplCalcBigIntThreshold( long nDPIX, long nDPIY, rThresRes.mnThresPixToLogY /= 2; } - - static void ImplCalcMapResolution( const MapMode& rMapMode, long nDPIX, long nDPIY, ImplMapRes& rMapRes ) { @@ -348,8 +336,6 @@ static void ImplCalcMapResolution( const MapMode& rMapMode, } } - - inline void ImplCalcMapResolution( const MapMode& rMapMode, long nDPIX, long nDPIY, ImplMapRes& rMapRes, @@ -359,8 +345,6 @@ inline void ImplCalcMapResolution( const MapMode& rMapMode, ImplCalcBigIntThreshold( nDPIX, nDPIY, rMapRes, rThresRes ); } - - static long ImplLogicToPixel( long n, long nDPI, long nMapNum, long nMapDenom, long nThres ) { @@ -395,8 +379,6 @@ static long ImplLogicToPixel( long n, long nDPI, long nMapNum, long nMapDenom, return n; } - - static long ImplPixelToLogic( long n, long nDPI, long nMapNum, long nMapDenom, long nThres ) { @@ -417,8 +399,6 @@ static long ImplPixelToLogic( long n, long nDPI, long nMapNum, long nMapDenom, return (n / 2); } - - long OutputDevice::ImplLogicXToDevicePixel( long nX ) const { if ( !mbMap ) @@ -429,8 +409,6 @@ long OutputDevice::ImplLogicXToDevicePixel( long nX ) const maThresRes.mnThresLogToPixX )+mnOutOffX+mnOutOffOrigX; } - - long OutputDevice::ImplLogicYToDevicePixel( long nY ) const { if ( !mbMap ) @@ -441,8 +419,6 @@ long OutputDevice::ImplLogicYToDevicePixel( long nY ) const maThresRes.mnThresLogToPixY )+mnOutOffY+mnOutOffOrigY; } - - long OutputDevice::ImplLogicWidthToDevicePixel( long nWidth ) const { if ( !mbMap ) @@ -453,8 +429,6 @@ long OutputDevice::ImplLogicWidthToDevicePixel( long nWidth ) const maThresRes.mnThresLogToPixX ); } - - long OutputDevice::ImplLogicHeightToDevicePixel( long nHeight ) const { if ( !mbMap ) @@ -473,8 +447,6 @@ float OutputDevice::ImplFloatLogicHeightToDevicePixel( float fLogicHeight) const return fPixelHeight; } - - long OutputDevice::ImplDevicePixelToLogicWidth( long nWidth ) const { if ( !mbMap ) @@ -485,8 +457,6 @@ long OutputDevice::ImplDevicePixelToLogicWidth( long nWidth ) const maThresRes.mnThresPixToLogX ); } - - long OutputDevice::ImplDevicePixelToLogicHeight( long nHeight ) const { if ( !mbMap ) @@ -497,8 +467,6 @@ long OutputDevice::ImplDevicePixelToLogicHeight( long nHeight ) const maThresRes.mnThresPixToLogY ); } - - Point OutputDevice::ImplLogicToDevicePixel( const Point& rLogicPt ) const { if ( !mbMap ) @@ -512,8 +480,6 @@ Point OutputDevice::ImplLogicToDevicePixel( const Point& rLogicPt ) const maThresRes.mnThresLogToPixY )+mnOutOffY+mnOutOffOrigY ); } - - Size OutputDevice::ImplLogicToDevicePixel( const Size& rLogicSize ) const { if ( !mbMap ) @@ -527,8 +493,6 @@ Size OutputDevice::ImplLogicToDevicePixel( const Size& rLogicSize ) const maThresRes.mnThresLogToPixY ) ); } - - Rectangle OutputDevice::ImplLogicToDevicePixel( const Rectangle& rLogicRect ) const { if ( rLogicRect.IsEmpty() ) @@ -554,8 +518,6 @@ Rectangle OutputDevice::ImplLogicToDevicePixel( const Rectangle& rLogicRect ) co maThresRes.mnThresLogToPixY )+mnOutOffY+mnOutOffOrigY ); } - - Polygon OutputDevice::ImplLogicToDevicePixel( const Polygon& rLogicPoly ) const { if ( !mbMap && !mnOutOffX && !mnOutOffY ) @@ -597,8 +559,6 @@ Polygon OutputDevice::ImplLogicToDevicePixel( const Polygon& rLogicPoly ) const return aPoly; } - - PolyPolygon OutputDevice::ImplLogicToDevicePixel( const PolyPolygon& rLogicPolyPoly ) const { if ( !mbMap && !mnOutOffX && !mnOutOffY ) @@ -614,8 +574,6 @@ PolyPolygon OutputDevice::ImplLogicToDevicePixel( const PolyPolygon& rLogicPolyP return aPolyPoly; } - - LineInfo OutputDevice::ImplLogicToDevicePixel( const LineInfo& rLineInfo ) const { LineInfo aInfo( rLineInfo ); @@ -643,8 +601,6 @@ LineInfo OutputDevice::ImplLogicToDevicePixel( const LineInfo& rLineInfo ) const return aInfo; } - - Rectangle OutputDevice::ImplDevicePixelToLogic( const Rectangle& rPixelRect ) const { if ( rPixelRect.IsEmpty() ) @@ -670,8 +626,6 @@ Rectangle OutputDevice::ImplDevicePixelToLogic( const Rectangle& rPixelRect ) co maThresRes.mnThresPixToLogY )-maMapRes.mnMapOfsY ); } - - Region OutputDevice::ImplPixelToDevicePixel( const Region& rRegion ) const { if ( !mnOutOffX && !mnOutOffY ) @@ -682,8 +636,6 @@ Region OutputDevice::ImplPixelToDevicePixel( const Region& rRegion ) const return aRegion; } - - void OutputDevice::EnableMapMode( bool bEnable ) { mbMap = bEnable; @@ -692,8 +644,6 @@ void OutputDevice::EnableMapMode( bool bEnable ) mpAlphaVDev->EnableMapMode( bEnable ); } - - void OutputDevice::SetMapMode() { @@ -726,8 +676,6 @@ void OutputDevice::SetMapMode() mpAlphaVDev->SetMapMode(); } - - void OutputDevice::SetMapMode( const MapMode& rNewMapMode ) { @@ -826,8 +774,6 @@ void OutputDevice::SetMapMode( const MapMode& rNewMapMode ) ImplInvalidateViewTransform(); } - - void OutputDevice::SetRelativeMapMode( const MapMode& rNewMapMode ) { // do nothing if MapMode did not change @@ -899,8 +845,6 @@ void OutputDevice::SetRelativeMapMode( const MapMode& rNewMapMode ) mpAlphaVDev->SetRelativeMapMode( rNewMapMode ); } - - // #i75163# basegfx::B2DHomMatrix OutputDevice::GetViewTransformation() const { @@ -935,8 +879,6 @@ basegfx::B2DHomMatrix OutputDevice::GetViewTransformation() const } } - - // #i75163# basegfx::B2DHomMatrix OutputDevice::GetInverseViewTransformation() const { @@ -963,8 +905,6 @@ basegfx::B2DHomMatrix OutputDevice::GetInverseViewTransformation() const } } - - // #i75163# basegfx::B2DHomMatrix OutputDevice::GetViewTransformation( const MapMode& rMapMode ) const { @@ -988,8 +928,6 @@ basegfx::B2DHomMatrix OutputDevice::GetViewTransformation( const MapMode& rMapMo return aTransform; } - - // #i75163# basegfx::B2DHomMatrix OutputDevice::GetInverseViewTransformation( const MapMode& rMapMode ) const { @@ -998,8 +936,6 @@ basegfx::B2DHomMatrix OutputDevice::GetInverseViewTransformation( const MapMode& return aMatrix; } - - basegfx::B2DHomMatrix OutputDevice::ImplGetDeviceTransformation() const { basegfx::B2DHomMatrix aTransformation = GetViewTransformation(); @@ -1009,8 +945,6 @@ basegfx::B2DHomMatrix OutputDevice::ImplGetDeviceTransformation() const return aTransformation; } - - Point OutputDevice::LogicToPixel( const Point& rLogicPt ) const { @@ -1025,8 +959,6 @@ Point OutputDevice::LogicToPixel( const Point& rLogicPt ) const maThresRes.mnThresLogToPixY )+mnOutOffOrigY ); } - - Size OutputDevice::LogicToPixel( const Size& rLogicSize ) const { @@ -1041,8 +973,6 @@ Size OutputDevice::LogicToPixel( const Size& rLogicSize ) const maThresRes.mnThresLogToPixY ) ); } - - Rectangle OutputDevice::LogicToPixel( const Rectangle& rLogicRect ) const { @@ -1063,8 +993,6 @@ Rectangle OutputDevice::LogicToPixel( const Rectangle& rLogicRect ) const maThresRes.mnThresLogToPixY )+mnOutOffOrigY ); } - - Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly ) const { @@ -1094,8 +1022,6 @@ Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly ) const return aPoly; } - - PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly ) const { @@ -1112,8 +1038,6 @@ PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly ) cons return aPolyPoly; } - - basegfx::B2DPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolygon& rLogicPoly ) const { basegfx::B2DPolygon aTransformedPoly = rLogicPoly; @@ -1122,8 +1046,6 @@ basegfx::B2DPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolygon& rLogi return aTransformedPoly; } - - basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly ) const { basegfx::B2DPolyPolygon aTransformedPoly = rLogicPolyPoly; @@ -1132,8 +1054,6 @@ basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygo return aTransformedPoly; } - - Region OutputDevice::LogicToPixel( const Region& rLogicRegion ) const { @@ -1168,8 +1088,6 @@ Region OutputDevice::LogicToPixel( const Region& rLogicRegion ) const return aRegion; } - - Point OutputDevice::LogicToPixel( const Point& rLogicPt, const MapMode& rMapMode ) const { @@ -1190,8 +1108,6 @@ Point OutputDevice::LogicToPixel( const Point& rLogicPt, aThresRes.mnThresLogToPixY )+mnOutOffOrigY ); } - - Size OutputDevice::LogicToPixel( const Size& rLogicSize, const MapMode& rMapMode ) const { @@ -1212,8 +1128,6 @@ Size OutputDevice::LogicToPixel( const Size& rLogicSize, aThresRes.mnThresLogToPixY ) ); } - - Rectangle OutputDevice::LogicToPixel( const Rectangle& rLogicRect, const MapMode& rMapMode ) const { @@ -1240,8 +1154,6 @@ Rectangle OutputDevice::LogicToPixel( const Rectangle& rLogicRect, aThresRes.mnThresLogToPixY )+mnOutOffOrigY ); } - - Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly, const MapMode& rMapMode ) const { @@ -1277,8 +1189,6 @@ Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly, return aPoly; } - - PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly, const MapMode& rMapMode ) const { @@ -1296,8 +1206,6 @@ PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly, return aPolyPoly; } - - basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly, const MapMode& rMapMode ) const { @@ -1307,8 +1215,6 @@ basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygo return aTransformedPoly; } - - basegfx::B2DPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolygon& rLogicPoly, const MapMode& rMapMode ) const { @@ -1318,8 +1224,6 @@ basegfx::B2DPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolygon& rLogi return aTransformedPoly; } - - Region OutputDevice::LogicToPixel( const Region& rLogicRegion, const MapMode& rMapMode ) const { @@ -1354,8 +1258,6 @@ Region OutputDevice::LogicToPixel( const Region& rLogicRegion, const MapMode& rM return aRegion; } - - Point OutputDevice::PixelToLogic( const Point& rDevicePt ) const { @@ -1370,8 +1272,6 @@ Point OutputDevice::PixelToLogic( const Point& rDevicePt ) const maThresRes.mnThresPixToLogY ) - maMapRes.mnMapOfsY - mnOutOffLogicY ); } - - Size OutputDevice::PixelToLogic( const Size& rDeviceSize ) const { @@ -1386,8 +1286,6 @@ Size OutputDevice::PixelToLogic( const Size& rDeviceSize ) const maThresRes.mnThresPixToLogY ) ); } - - Rectangle OutputDevice::PixelToLogic( const Rectangle& rDeviceRect ) const { @@ -1408,8 +1306,6 @@ Rectangle OutputDevice::PixelToLogic( const Rectangle& rDeviceRect ) const maThresRes.mnThresPixToLogY ) - maMapRes.mnMapOfsY - mnOutOffLogicY ); } - - Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly ) const { @@ -1439,8 +1335,6 @@ Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly ) const return aPoly; } - - PolyPolygon OutputDevice::PixelToLogic( const PolyPolygon& rDevicePolyPoly ) const { @@ -1465,8 +1359,6 @@ basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolyPolygo return aTransformedPoly; } - - Region OutputDevice::PixelToLogic( const Region& rDeviceRegion ) const { @@ -1501,8 +1393,6 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion ) const return aRegion; } - - Point OutputDevice::PixelToLogic( const Point& rDevicePt, const MapMode& rMapMode ) const { @@ -1524,8 +1414,6 @@ Point OutputDevice::PixelToLogic( const Point& rDevicePt, aThresRes.mnThresPixToLogY ) - aMapRes.mnMapOfsY - mnOutOffLogicY ); } - - Size OutputDevice::PixelToLogic( const Size& rDeviceSize, const MapMode& rMapMode ) const { @@ -1547,8 +1435,6 @@ Size OutputDevice::PixelToLogic( const Size& rDeviceSize, aThresRes.mnThresPixToLogY ) ); } - - Rectangle OutputDevice::PixelToLogic( const Rectangle& rDeviceRect, const MapMode& rMapMode ) const { @@ -1576,8 +1462,6 @@ Rectangle OutputDevice::PixelToLogic( const Rectangle& rDeviceRect, aThresRes.mnThresPixToLogY ) - aMapRes.mnMapOfsY - mnOutOffLogicY ); } - - Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly, const MapMode& rMapMode ) const { @@ -1614,8 +1498,6 @@ Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly, return aPoly; } - - PolyPolygon OutputDevice::PixelToLogic( const PolyPolygon& rDevicePolyPoly, const MapMode& rMapMode ) const { @@ -1633,8 +1515,6 @@ PolyPolygon OutputDevice::PixelToLogic( const PolyPolygon& rDevicePolyPoly, return aPolyPoly; } - - basegfx::B2DPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolygon& rPixelPoly, const MapMode& rMapMode ) const { @@ -1644,8 +1524,6 @@ basegfx::B2DPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolygon& rPixe return aTransformedPoly; } - - basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolyPolygon& rPixelPolyPoly, const MapMode& rMapMode ) const { @@ -1655,8 +1533,6 @@ basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolyPolygo return aTransformedPoly; } - - Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& rMapMode ) const { @@ -1691,8 +1567,6 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r return aRegion; } - - #define ENTER0( rSource, pMapModeSource, pMapModeDest ) \ if ( !pMapModeSource ) \ pMapModeSource = &maMapMode; \ @@ -1701,8 +1575,6 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r if ( *pMapModeSource == *pMapModeDest ) \ return rSource - - #define ENTER1( rSource, pMapModeSource, pMapModeDest ) \ ENTER0( rSource, pMapModeSource, pMapModeDest ); \ \ @@ -1734,8 +1606,6 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r else \ aMapResDest = maMapRes - - #define ENTER2( eUnitSource, eUnitDest ) \ DBG_ASSERT( eUnitSource != MAP_SYSFONT \ && eUnitSource != MAP_APPFONT \ @@ -1750,8 +1620,6 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r DBG_ASSERTWARNING( eUnitDest != MAP_PIXEL, \ "MAP_PIXEL mit 72dpi angenaehert" ) - - #define ENTER3( eUnitSource, eUnitDest ) \ long nNumerator = 1; \ long nDenominator = 1; \ @@ -1769,8 +1637,6 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r else if( eUnitDest == MAP_PIXEL ) \ nNumerator *= 72 - - #define ENTER4( rMapModeSource, rMapModeDest ) \ ImplMapRes aMapResSource; \ aMapResSource.mnMapOfsX = 0; \ @@ -1784,8 +1650,6 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r ImplCalcMapResolution( rMapModeSource, 72, 72, aMapResSource ); \ ImplCalcMapResolution( rMapModeDest, 72, 72, aMapResDest ) - - // return (n1 * n2 * n3) / (n4 * n5) static long fn5( const long n1, const long n2, @@ -1904,8 +1768,6 @@ static long fn5( const long n1, } // of else } - - // return (n1 * n2) / n3 static long fn3( const long n1, const long n2, const long n3 ) { @@ -1941,8 +1803,6 @@ static long fn3( const long n1, const long n2, const long n3 ) } // of else } - - Point OutputDevice::LogicToLogic( const Point& rPtSource, const MapMode* pMapModeSource, const MapMode* pMapModeDest ) const @@ -1959,8 +1819,6 @@ Point OutputDevice::LogicToLogic( const Point& rPtSource, aMapResDest.mnMapOfsY ); } - - Size OutputDevice::LogicToLogic( const Size& rSzSource, const MapMode* pMapModeSource, const MapMode* pMapModeDest ) const @@ -1975,8 +1833,6 @@ Size OutputDevice::LogicToLogic( const Size& rSzSource, aMapResSource.mnMapScDenomY, aMapResDest.mnMapScNumY ) ); } - - Rectangle OutputDevice::LogicToLogic( const Rectangle& rRectSource, const MapMode* pMapModeSource, const MapMode* pMapModeDest ) const @@ -2001,8 +1857,6 @@ Rectangle OutputDevice::LogicToLogic( const Rectangle& rRectSource, aMapResDest.mnMapOfsY ); } - - Point OutputDevice::LogicToLogic( const Point& rPtSource, const MapMode& rMapModeSource, const MapMode& rMapModeDest ) @@ -2037,8 +1891,6 @@ Point OutputDevice::LogicToLogic( const Point& rPtSource, } } - - Size OutputDevice::LogicToLogic( const Size& rSzSource, const MapMode& rMapModeSource, const MapMode& rMapModeDest ) @@ -2071,8 +1923,6 @@ Size OutputDevice::LogicToLogic( const Size& rSzSource, } } - - basegfx::B2DPolygon OutputDevice::LogicToLogic( const basegfx::B2DPolygon& rPolySource, const MapMode& rMapModeSource, const MapMode& rMapModeDest ) @@ -2089,8 +1939,6 @@ basegfx::B2DPolygon OutputDevice::LogicToLogic( const basegfx::B2DPolygon& rPoly return aPoly; } - - basegfx::B2DPolyPolygon OutputDevice::LogicToLogic( const basegfx::B2DPolyPolygon& rPolySource, const MapMode& rMapModeSource, const MapMode& rMapModeDest ) @@ -2107,8 +1955,6 @@ basegfx::B2DPolyPolygon OutputDevice::LogicToLogic( const basegfx::B2DPolyPolygo return aPoly; } - - basegfx::B2DHomMatrix OutputDevice::LogicToLogic(const MapMode& rMapModeSource, const MapMode& rMapModeDest) { basegfx::B2DHomMatrix aTransform; @@ -2148,8 +1994,6 @@ basegfx::B2DHomMatrix OutputDevice::LogicToLogic(const MapMode& rMapModeSource, return aTransform; } - - Rectangle OutputDevice::LogicToLogic( const Rectangle& rRectSource, const MapMode& rMapModeSource, const MapMode& rMapModeDest ) @@ -2194,8 +2038,6 @@ Rectangle OutputDevice::LogicToLogic( const Rectangle& rRectSource, } } - - long OutputDevice::LogicToLogic( long nLongSource, MapUnit eUnitSource, MapUnit eUnitDest ) { @@ -2208,8 +2050,6 @@ long OutputDevice::LogicToLogic( long nLongSource, return fn3( nLongSource, nNumerator, nDenominator ); } - - void OutputDevice::SetPixelOffset( const Size& rOffset ) { mnOutOffOrigX = rOffset.Width(); @@ -2226,15 +2066,11 @@ void OutputDevice::SetPixelOffset( const Size& rOffset ) mpAlphaVDev->SetPixelOffset( rOffset ); } - - Size OutputDevice::GetPixelOffset() const { return Size(mnOutOffOrigX, mnOutOffOrigY); } - - long Window::ImplLogicUnitToPixelX( long nX, MapUnit eUnit ) { if ( eUnit != MAP_PIXEL ) @@ -2260,8 +2096,6 @@ long Window::ImplLogicUnitToPixelX( long nX, MapUnit eUnit ) return nX; } - - long Window::ImplLogicUnitToPixelY( long nY, MapUnit eUnit ) { if ( eUnit != MAP_PIXEL ) diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx index 327c46bc6ba6..7a1f437f53f8 100644 --- a/vcl/source/gdi/pdfextoutdevdata.cxx +++ b/vcl/source/gdi/pdfextoutdevdata.cxx @@ -25,7 +25,6 @@ #include "basegfx/polygon/b2dpolygon.hxx" #include "basegfx/polygon/b2dpolygontools.hxx" - #include <boost/shared_ptr.hpp> #include <set> #include <map> diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx index de00ac33c87a..1249d6c0653c 100644 --- a/vcl/source/gdi/pdfwriter.cxx +++ b/vcl/source/gdi/pdfwriter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <pdfwriter_impl.hxx> #include <vcl/bitmapex.hxx> #include <vcl/image.hxx> diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 6646c7b994fe..c37f416b09cc 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -66,7 +66,6 @@ #include "pdfwriter_impl.hxx" - #if !defined(ANDROID) && !defined(IOS) // NSS header files for PDF signing support #include "nss.h" @@ -294,7 +293,6 @@ void doTestCode() BitmapEx aBmpEx( aImageBmp, AlphaMask( aTransMask ) ); aWriter.DrawBitmapEx( Point( 1500, 19500 ), Size( 4800, 3000 ), aBmpEx ); - aWriter.EndStructureElement(); aWriter.EndStructureElement(); @@ -3430,7 +3428,6 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const Physical endCompression(); disableStreamEncryption(); - sal_uInt64 nEndStreamPos = 0; osl_getFilePos( m_aFile, &nEndStreamPos ); @@ -4285,7 +4282,6 @@ bool PDFWriterImpl::appendDest( sal_Int32 nDestID, OStringBuffer& rBuffer ) return false; } - const PDFDest& rDest = m_aDests[ nDestID ]; const PDFPage& rDestPage = m_aPages[ rDest.m_nPage ]; @@ -7960,7 +7956,6 @@ void PDFWriterImpl::drawText( const Rectangle& rRect, const OUString& rOrigStr, aPos.X() = rRect.Left(); } - // output last line left adjusted since it was shortened if (!aLastLine.isEmpty()) drawText( aPos, aLastLine, 0, aLastLine.getLength(), bTextLines ); @@ -10700,7 +10695,6 @@ bool PDFWriterImpl::intersectClipRegion( const Rectangle& rRect ) return intersectClipRegion( aRect ); } - bool PDFWriterImpl::intersectClipRegion( const basegfx::B2DPolyPolygon& rRegion ) { basegfx::B2DPolyPolygon aRegion( getReferenceDevice()->LogicToPixel( rRegion, m_aGraphicsStack.front().m_aMapMode ) ); @@ -11649,7 +11643,6 @@ void PDFWriterImpl::setStructureBoundingBox( const Rectangle& rRect ) if( nPageNr < 0 || nPageNr >= (sal_Int32)m_aPages.size() || !m_aContext.Tagged ) return; - if( m_nCurrentStructElement > 0 && m_bEmitStructure ) { PDFWriter::StructElement eType = m_aStructure[ m_nCurrentStructElement ].m_eType; diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index b94e4f404608..07fab7f384ee 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -93,7 +93,6 @@ public: OString getNameObject() const; }; - enum ResourceKind { ResXObject, ResExtGState, ResShading, ResPattern }; typedef std::map< OString, sal_Int32 > ResourceMap; struct ResourceDict @@ -550,7 +549,6 @@ public: PDFAddStream() : m_pStream( NULL ), m_nStreamObject( 0 ), m_bCompress( true ) {} }; - // helper structure for drawLayout and friends struct PDFGlyph { @@ -570,7 +568,6 @@ public: {} }; - static const sal_Char* getStructureTag( PDFWriter::StructElement ); static const sal_Char* getAttributeTag( PDFWriter::StructAttribute eAtr ); static const sal_Char* getAttributeValueTag( PDFWriter::StructAttributeValue eVal ); @@ -679,7 +676,6 @@ private: oslFileHandle m_aFile; bool m_bOpen; - /* output redirection; e.g. to accumulate content streams for XObjects */ @@ -1097,7 +1093,6 @@ public: void setDocumentLocale( const com::sun::star::lang::Locale& rLoc ) { m_aContext.DocumentLocale = rLoc; } - /* graphics state */ void push( sal_uInt16 nFlags ); void pop(); @@ -1106,7 +1101,6 @@ public: void setMapMode( const MapMode& rMapMode ); - const MapMode& getMapMode() { return m_aGraphicsStack.front().m_aMapMode; } void setLineColor( const Color& rColor ) @@ -1302,5 +1296,4 @@ public: #endif //_VCL_PDFEXPORT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index d64d68a59a4d..30b4b6cc4067 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -50,8 +50,6 @@ using namespace com::sun::star::beans; static bool lcl_canUsePDFAxialShading(const Gradient& rGradient); - - void PDFWriterImpl::implWriteGradient( const PolyPolygon& i_rPolyPoly, const Gradient& i_rGradient, VirtualDevice* i_pDummyVDev, const vcl::PDFWriter::PlayMetafileContext& i_rContext ) { @@ -65,8 +63,6 @@ void PDFWriterImpl::implWriteGradient( const PolyPolygon& i_rPolyPoly, const Gra m_rOuterFace.Pop(); } - - void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSize, const BitmapEx& i_rBitmapEx, VirtualDevice* i_pDummyVDev, const vcl::PDFWriter::PlayMetafileContext& i_rContext ) { @@ -243,9 +239,6 @@ void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSiz } } - - - void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevData* i_pOutDevData, const vcl::PDFWriter::PlayMetafileContext& i_rContext, VirtualDevice* pDummyVDev ) { bool bAssertionFired( false ); @@ -868,7 +861,6 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } break; - case( META_TEXTLINE_ACTION ): { const MetaTextLineAction* pA = (const MetaTextLineAction*) pAction; @@ -1937,7 +1929,6 @@ static const PixelCode BlackPixelCodes[] = { 2560, 12, 0x1F } // 0000 0001 1111 }; - void PDFWriterImpl::putG4Span( long i_nSpan, bool i_bWhitePixel, BitStreamState& io_rState ) { const PixelCode* pTable = i_bWhitePixel ? WhitePixelCodes : BlackPixelCodes; @@ -2066,5 +2057,4 @@ static bool lcl_canUsePDFAxialShading(const Gradient& rGradient) { return true; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index d6eb73f59274..c5009d8586ca 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/pngread.hxx> #include <cmath> @@ -1646,7 +1645,6 @@ void PNGReader::SetIgnoreGammaChunk( bool b ) mpImpl->SetIgnoreGammaChunk( b ); } - } // namespace vcl /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx index 6ee397751cd9..ff836c59578d 100644 --- a/vcl/source/gdi/pngwrite.cxx +++ b/vcl/source/gdi/pngwrite.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/pngwrite.hxx> #include <cmath> diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index f6ebc67f3bc0..7adfcdef8bce 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <list> #include <tools/debug.hxx> @@ -78,7 +77,6 @@ namespace } } - void ImplUpdateJobSetupPaper( JobSetup& rJobSetup ) { const ImplJobSetup* pConstData = rJobSetup.ImplGetConstData(); @@ -117,7 +115,6 @@ PrinterOptions::PrinterOptions() : { } - PrinterOptions::~PrinterOptions() { } @@ -250,7 +247,6 @@ void Printer::DrawDeviceBitmap( const Point& rDestPt, const Size& rDestSize, } } - void Printer::EmulateDrawTransparent ( const PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ) { @@ -328,7 +324,6 @@ void Printer::EmulateDrawTransparent ( const PolyPolygon& rPolyPoly, mpAlphaVDev = pOldAlphaVDev; } - void Printer::DrawOutDev( const Point& /*rDestPt*/, const Size& /*rDestSize*/, const Point& /*rSrcPt*/, const Size& /*rSrcSize*/ ) { @@ -367,7 +362,6 @@ QueueInfo::QueueInfo() mnJobs = 0; } - QueueInfo::QueueInfo( const QueueInfo& rInfo ) : maPrinterName( rInfo.maPrinterName ), maDriver( rInfo.maDriver ), @@ -378,12 +372,10 @@ QueueInfo::QueueInfo( const QueueInfo& rInfo ) : { } - QueueInfo::~QueueInfo() { } - bool QueueInfo::operator==( const QueueInfo& rInfo ) const { return @@ -395,7 +387,6 @@ bool QueueInfo::operator==( const QueueInfo& rInfo ) const mnJobs == rInfo.mnJobs; } - SvStream& WriteQueueInfo( SvStream& rOStream, const QueueInfo& rInfo ) { VersionCompat aCompat( rOStream, STREAM_WRITE, 1 ); @@ -410,7 +401,6 @@ SvStream& WriteQueueInfo( SvStream& rOStream, const QueueInfo& rInfo ) return rOStream; } - SvStream& ReadQueueInfo( SvStream& rIStream, QueueInfo& rInfo ) { VersionCompat aCompat( rIStream, STREAM_READ ); @@ -425,7 +415,6 @@ SvStream& ReadQueueInfo( SvStream& rIStream, QueueInfo& rInfo ) return rIStream; } - SalPrinterQueueInfo::SalPrinterQueueInfo() { mnStatus = 0; @@ -433,12 +422,10 @@ SalPrinterQueueInfo::SalPrinterQueueInfo() mpSysData = NULL; } - SalPrinterQueueInfo::~SalPrinterQueueInfo() { } - ImplPrnQueueList::~ImplPrnQueueList() { ImplSVData* pSVData = ImplGetSVData(); @@ -449,7 +436,6 @@ ImplPrnQueueList::~ImplPrnQueueList() } } - void ImplPrnQueueList::Add( SalPrinterQueueInfo* pData ) { boost::unordered_map< OUString, sal_Int32, OUStringHash >::iterator it = @@ -472,7 +458,6 @@ void ImplPrnQueueList::Add( SalPrinterQueueInfo* pData ) } } - ImplPrnQueueData* ImplPrnQueueList::Get( const OUString& rPrinter ) { ImplPrnQueueData* pData = NULL; @@ -483,7 +468,6 @@ ImplPrnQueueData* ImplPrnQueueList::Get( const OUString& rPrinter ) return pData; } - static void ImplInitPrnQueueList() { ImplSVData* pSVData = ImplGetSVData(); @@ -495,7 +479,6 @@ static void ImplInitPrnQueueList() pSVData->mpDefInst->GetPrinterQueueInfo( pSVData->maGDIData.mpPrinterQueueList ); } - void ImplDeletePrnQueueList() { ImplSVData* pSVData = ImplGetSVData(); @@ -508,7 +491,6 @@ void ImplDeletePrnQueueList() } } - const std::vector<OUString>& Printer::GetPrinterQueues() { ImplSVData* pSVData = ImplGetSVData(); @@ -547,7 +529,6 @@ const QueueInfo* Printer::GetQueueInfo( const OUString& rPrinterName, bool bStat return NULL; } - OUString Printer::GetDefaultPrinterName() { static const char* pEnv = getenv( "SAL_DISABLE_DEFAULTPRINTER" ); @@ -560,7 +541,6 @@ OUString Printer::GetDefaultPrinterName() return OUString(); } - void Printer::ImplInitData() { mbDevOutput = false; @@ -803,7 +783,6 @@ void Printer::ImplInit( SalPrinterQueueInfo* pInfo ) mpGraphics->GetDevFontList( mpFontCollection ); } - void Printer::ImplInitDisplay( const Window* pWindow ) { ImplSVData* pSVData = ImplGetSVData(); @@ -955,7 +934,6 @@ SalPrinterQueueInfo* Printer::ImplGetQueueInfo( const OUString& rPrinterName, return NULL; } - void Printer::ImplUpdatePageData() { // we need a graphics @@ -969,7 +947,6 @@ void Printer::ImplUpdatePageData() maPaperSize.Width(), maPaperSize.Height() ); } - void Printer::ImplUpdateFontList() { ImplUpdateFontData( true ); @@ -997,7 +974,6 @@ Printer::Printer() ImplInitDisplay( NULL ); } - Printer::Printer( const JobSetup& rJobSetup ) : maJobSetup( rJobSetup ) { @@ -1016,7 +992,6 @@ Printer::Printer( const JobSetup& rJobSetup ) : } } - Printer::Printer( const QueueInfo& rQueueInfo ) { ImplInitData(); @@ -1028,7 +1003,6 @@ Printer::Printer( const QueueInfo& rQueueInfo ) ImplInitDisplay( NULL ); } - Printer::Printer( const OUString& rPrinterName ) { ImplInitData(); @@ -1039,7 +1013,6 @@ Printer::Printer( const OUString& rPrinterName ) ImplInitDisplay( NULL ); } - Printer::~Printer() { DBG_ASSERT( !IsPrinting(), "Printer::~Printer() - Job is printing" ); @@ -1100,7 +1073,6 @@ sal_uLong Printer::GetCapabilities( sal_uInt16 nType ) const return 0; } - bool Printer::HasSupport( PrinterSupport eFeature ) const { switch ( eFeature ) @@ -1128,7 +1100,6 @@ bool Printer::HasSupport( PrinterSupport eFeature ) const return true; } - bool Printer::SetJobSetup( const JobSetup& rSetup ) { if ( IsDisplayPrinter() || mbInPrintPage ) @@ -1150,8 +1121,6 @@ bool Printer::SetJobSetup( const JobSetup& rSetup ) return false; } - - bool Printer::Setup( Window* pWindow ) { if ( IsDisplayPrinter() ) @@ -1187,7 +1156,6 @@ bool Printer::Setup( Window* pWindow ) return false; } - bool Printer::SetPrinterProps( const Printer* pPrinter ) { if ( IsJobActive() || IsPrinting() ) @@ -1295,7 +1263,6 @@ bool Printer::SetPrinterProps( const Printer* pPrinter ) return false; } - bool Printer::SetOrientation( Orientation eOrientation ) { if ( mbInPrintPage ) @@ -1331,13 +1298,11 @@ bool Printer::SetOrientation( Orientation eOrientation ) return true; } - Orientation Printer::GetOrientation() const { return maJobSetup.ImplGetConstData()->meOrientation; } - bool Printer::SetPaperBin( sal_uInt16 nPaperBin ) { if ( mbInPrintPage ) @@ -1374,13 +1339,11 @@ bool Printer::SetPaperBin( sal_uInt16 nPaperBin ) return true; } - sal_uInt16 Printer::GetPaperBin() const { return maJobSetup.ImplGetConstData()->mnPaperBin; } - // Map user paper format to a available printer paper formats void Printer::ImplFindPaperFormatForUserSize( JobSetup& aJobSetup, bool bMatchNearest ) { @@ -1470,7 +1433,6 @@ void Printer::ImplFindPaperFormatForUserSize( JobSetup& aJobSetup, bool bMatchNe } } - bool Printer::SetPaper( Paper ePaper ) { if ( mbInPrintPage ) @@ -1514,7 +1476,6 @@ bool Printer::SetPaper( Paper ePaper ) return true; } - bool Printer::SetPaperSizeUser( const Size& rSize ) { return SetPaperSizeUser( rSize, false ); @@ -1578,7 +1539,6 @@ bool Printer::SetPaperSizeUser( const Size& rSize, bool bMatchNearest ) return true; } - int Printer::GetPaperInfoCount() const { if( ! mpInfoPrinter ) @@ -1588,7 +1548,6 @@ int Printer::GetPaperInfoCount() const return mpInfoPrinter->m_aPaperFormats.size(); } - OUString Printer::GetPaperName( Paper ePaper ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1619,7 +1578,6 @@ OUString Printer::GetPaperName( Paper ePaper ) return (it != pSVData->mpPaperNames->end()) ? it->second : OUString(); } - OUString Printer::GetPaperName( bool i_bPaperUser ) const { Size aPageSize = PixelToLogic( GetPaperSizePixel(), MAP_100TH_MM ); @@ -1629,7 +1587,6 @@ OUString Printer::GetPaperName( bool i_bPaperUser ) const return (ePaper != PAPER_USER || i_bPaperUser ) ? GetPaperName( ePaper ) : OUString(); } - const PaperInfo& Printer::GetPaperInfo( int nPaper ) const { if( ! mpInfoPrinter ) @@ -1641,7 +1598,6 @@ const PaperInfo& Printer::GetPaperInfo( int nPaper ) const return mpInfoPrinter->m_aPaperFormats[nPaper]; } - bool Printer::SetDuplexMode( DuplexMode eDuplex ) { if ( mbInPrintPage ) @@ -1677,19 +1633,16 @@ bool Printer::SetDuplexMode( DuplexMode eDuplex ) return true; } - int Printer::GetLandscapeAngle() const { return mpInfoPrinter ? mpInfoPrinter->GetLandscapeAngle( maJobSetup.ImplGetConstData() ) : 900; } - Paper Printer::GetPaper() const { return maJobSetup.ImplGetConstData()->mePaperFormat; } - sal_uInt16 Printer::GetPaperBinCount() const { if ( IsDisplayPrinter() ) @@ -1698,7 +1651,6 @@ sal_uInt16 Printer::GetPaperBinCount() const return (sal_uInt16)mpInfoPrinter->GetPaperBinCount( maJobSetup.ImplGetConstData() ); } - OUString Printer::GetPaperBinName( sal_uInt16 nPaperBin ) const { if ( IsDisplayPrinter() ) @@ -1710,7 +1662,6 @@ OUString Printer::GetPaperBinName( sal_uInt16 nPaperBin ) const return OUString(); } - bool Printer::SetCopyCount( sal_uInt16 nCopy, bool bCollate ) { mnCopyCount = nCopy; @@ -1718,14 +1669,11 @@ bool Printer::SetCopyCount( sal_uInt16 nCopy, bool bCollate ) return true; } - void Printer::Error() { maErrorHdl.Call( this ); } - - sal_uLong Printer::ImplSalPrinterErrorCodeToVCL( sal_uLong nError ) { sal_uLong nVCLError; @@ -1745,7 +1693,6 @@ sal_uLong Printer::ImplSalPrinterErrorCodeToVCL( sal_uLong nError ) return nVCLError; } - bool Printer::EndJob() { bool bRet = false; @@ -1778,7 +1725,6 @@ bool Printer::EndJob() return bRet; } - void Printer::ImplStartPage() { if ( !IsJobActive() ) @@ -1804,7 +1750,6 @@ void Printer::ImplStartPage() } } - void Printer::ImplEndPage() { if ( !IsJobActive() ) @@ -1823,7 +1768,6 @@ void Printer::ImplEndPage() } } - void Printer::updatePrinters() { ImplSVData* pSVData = ImplGetSVData(); diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx index 098deabe588e..c16e702c6121 100644 --- a/vcl/source/gdi/print2.cxx +++ b/vcl/source/gdi/print2.cxx @@ -713,12 +713,8 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, // regions of rectangle-bounded connected components. This // algorithm was designed by AF. - - // STAGE 1: Detect background - - // Receives uniform background content, and is _not_ merged // nor checked for intersection against other aCCList elements ConnectedComponents aBackgroundComponent; @@ -860,11 +856,8 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, ++nActionNum; } - // STAGE 2: Generate connected components list - - // iterate over all actions (start where background action // search left off) for( ; @@ -888,11 +881,8 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, bool bTreatSpecial( false ); ConnectedComponents aTotalComponents; - // STAGE 2.1: Search for intersecting cc entries - - // if aBBCurrAct is empty, it will intersect with no // aCCList member. Thus, we can save the check. // Furthermore, this ensures that non-output-generating @@ -983,11 +973,8 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, while( bSomeComponentsChanged ); } - // STAGE 2.2: Determine special state for cc element - - // now test whether the whole connected component must be // treated specially (i.e. rendered as a bitmap): if the // added action is the very first action, or all actions @@ -1053,12 +1040,8 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, } } - - // STAGE 2.3: Add newly generated CC list element - - // set new bounds and add action to list aTotalComponents.aBounds = aTotalBounds; aTotalComponents.aComponentList.push_back( @@ -1104,11 +1087,8 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, } } - // STAGE 3.1: Output background mtf actions (if there are any) - - ComponentList::iterator aCurrAct( aBackgroundComponent.aComponentList.begin() ); const ComponentList::iterator aLastAct( aBackgroundComponent.aComponentList.end() ); for( ; aCurrAct != aLastAct; ++aCurrAct ) @@ -1118,12 +1098,8 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, rOutMtf.AddAction( ( aCurrAct->first->Duplicate(), aCurrAct->first ) ); } - - // STAGE 3.2: Generate banded bitmaps for special regions - - Point aPageOffset; Size aTmpSize( GetOutputSizePixel() ); if( mpPDFWriter ) @@ -1296,11 +1272,8 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, while( nCount-- ) aMapModeVDev.Pop(); - // STAGE 4: Copy actions to output metafile - - // iterate over all actions and duplicate the ones not in a // special aCCList member into rOutMtf for( pCurrAct=const_cast<GDIMetaFile&>(rInMtf).FirstAction(), nActionNum=0; diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index be3dc9c3c8f4..d64213e7f709 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -553,7 +553,6 @@ bool Printer::StartJob( const OUString& i_rJobName, boost::shared_ptr<vcl::Print else bCollateCopy = false; - ImplSVData* pSVData = ImplGetSVData(); mpPrinter = pSVData->mpDefInst->CreatePrinter( mpInfoPrinter ); @@ -1202,7 +1201,6 @@ sal_uLong PrinterController::removeTransparencies( GDIMetaFile& i_rIn, GDIMetaFi static const sal_Int32 OPTIMAL_BMP_RESOLUTION = 300; static const sal_Int32 NORMAL_BMP_RESOLUTION = 200; - if( rPrinterOptions.IsReduceBitmaps() ) { // calculate maximum resolution for bitmap graphics diff --git a/vcl/source/gdi/regband.cxx b/vcl/source/gdi/regband.cxx index c54d22ced48f..4268f9fc72c2 100644 --- a/vcl/source/gdi/regband.cxx +++ b/vcl/source/gdi/regband.cxx @@ -25,8 +25,6 @@ #include "regband.hxx" - - // ImplRegionBand // Each band contains all rectangles between upper and lower border. @@ -41,9 +39,6 @@ // points in a list). After registration of these points they are // converted to rectangles and the points in the list are deleted. - - - ImplRegionBand::ImplRegionBand( long nTop, long nBottom ) { // save boundaries @@ -58,8 +53,6 @@ ImplRegionBand::ImplRegionBand( long nTop, long nBottom ) mbTouched = false; } - - ImplRegionBand::ImplRegionBand( const ImplRegionBand& rRegionBand, const bool bIgnorePoints) @@ -120,8 +113,6 @@ ImplRegionBand::ImplRegionBand( } } - - ImplRegionBand::~ImplRegionBand() { DBG_ASSERT( mpFirstBandPoint == NULL, "ImplRegionBand::~ImplRegionBand -> pointlist not empty" ); @@ -145,8 +136,6 @@ ImplRegionBand::~ImplRegionBand() } } - - // generate separations from lines and process union with existing // separations @@ -198,8 +187,6 @@ void ImplRegionBand::ProcessPoints() mpFirstBandPoint = NULL; } - - // generate separations from lines and process union with existing // separations @@ -311,8 +298,6 @@ bool ImplRegionBand::InsertPoint( long nX, long nLineId, return true; } - - void ImplRegionBand::MoveX( long nHorzMove ) { // move all x-separations @@ -325,8 +310,6 @@ void ImplRegionBand::MoveX( long nHorzMove ) } } - - void ImplRegionBand::ScaleX( double fHorzScale ) { ImplRegionBandSep* pSep = mpFirstSep; @@ -338,8 +321,6 @@ void ImplRegionBand::ScaleX( double fHorzScale ) } } - - // combine overlapping separations bool ImplRegionBand::OptimizeBand() @@ -383,8 +364,6 @@ bool ImplRegionBand::OptimizeBand() return true; } - - void ImplRegionBand::Union( long nXLeft, long nXRight ) { DBG_ASSERT( nXLeft <= nXRight, "ImplRegionBand::Union(): nxLeft > nXRight" ); @@ -457,8 +436,6 @@ void ImplRegionBand::Union( long nXLeft, long nXRight ) OptimizeBand(); } - - void ImplRegionBand::Intersect( long nXLeft, long nXRight ) { DBG_ASSERT( nXLeft <= nXRight, "ImplRegionBand::Intersect(): nxLeft > nXRight" ); @@ -504,8 +481,6 @@ void ImplRegionBand::Intersect( long nXLeft, long nXRight ) OptimizeBand(); } - - void ImplRegionBand::Exclude( long nXLeft, long nXRight ) { DBG_ASSERT( nXLeft <= nXRight, "ImplRegionBand::Exclude(): nxLeft > nXRight" ); @@ -584,8 +559,6 @@ void ImplRegionBand::Exclude( long nXLeft, long nXRight ) OptimizeBand(); } - - void ImplRegionBand::XOr( long nXLeft, long nXRight ) { DBG_ASSERT( nXLeft <= nXRight, "ImplRegionBand::XOr(): nxLeft > nXRight" ); @@ -623,7 +596,6 @@ void ImplRegionBand::XOr( long nXLeft, long nXRight ) // #9 inside-left == < The new is fully inside the old, coincides on the left intersect Yes - // Then, to correctly perform XOr, the segment that's switched off // (i.e. the overlapping part of the old and the new segment) must // be extended by one pixel value at each border: @@ -635,7 +607,6 @@ void ImplRegionBand::XOr( long nXLeft, long nXRight ) // trailing band sep from 11 to 14. This mimicks the xor look of a // bitmap operation. - // band empty? -> add element if ( !mpFirstSep ) { @@ -831,8 +802,6 @@ void ImplRegionBand::XOr( long nXLeft, long nXRight ) OptimizeBand(); } - - bool ImplRegionBand::IsInside( long nX ) { ImplRegionBandSep* pSep = mpFirstSep; @@ -847,8 +816,6 @@ bool ImplRegionBand::IsInside( long nX ) return false; } - - long ImplRegionBand::GetXLeftBoundary() const { DBG_ASSERT( mpFirstSep != NULL, "ImplRegionBand::XLeftBoundary -> no separation in band!" ); @@ -856,8 +823,6 @@ long ImplRegionBand::GetXLeftBoundary() const return mpFirstSep->mnXLeft; } - - long ImplRegionBand::GetXRightBoundary() const { DBG_ASSERT( mpFirstSep != NULL, "ImplRegionBand::XRightBoundary -> no separation in band!" ); @@ -869,8 +834,6 @@ long ImplRegionBand::GetXRightBoundary() const return pSep->mnXRight; } - - bool ImplRegionBand::operator==( const ImplRegionBand& rRegionBand ) const { ImplRegionBandSep* pOwnRectBandSep = mpFirstSep; @@ -902,8 +865,6 @@ bool ImplRegionBand::operator==( const ImplRegionBand& rRegionBand ) const return true; } - - ImplRegionBand* ImplRegionBand::SplitBand (const sal_Int32 nY) { OSL_ASSERT(nY>mnYTop); diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index ff8314c61d57..a6cfb65ec782 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -32,11 +32,6 @@ #include <basegfx/range/b2drange.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> - - - - - namespace { /** Return <TRUE/> when the given polygon is rectiliner and oriented so that @@ -226,8 +221,6 @@ namespace } } // end of anonymous namespace - - bool Region::IsEmpty() const { return !mbIsNull && !mpB2DPolyPolygon.get() && !mpPolyPolygon.get() && !mpRegionBand.get(); @@ -1419,8 +1412,6 @@ bool Region::IsInside( const Rectangle& rRect ) const return aRegion.IsEmpty(); } - - bool Region::IsOver( const Rectangle& rRect ) const { if(IsEmpty()) diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx index b74a780cff67..fa767433d0f9 100644 --- a/vcl/source/gdi/regionband.cxx +++ b/vcl/source/gdi/regionband.cxx @@ -21,11 +21,6 @@ #include <tools/debug.hxx> #include <regionband.hxx> - - - - - RegionBand::RegionBand() : mpFirstBand(0), mpLastCheckedBand(0) @@ -62,7 +57,6 @@ RegionBand& RegionBand::operator=(const RegionBand& rRef) pBand = pBand->mpNextBand; } - return *this; } diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index f22568e87479..faac7782b899 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -71,7 +71,6 @@ FILE * mslLog() } #endif - std::ostream &operator <<(std::ostream& s, ImplLayoutArgs &rArgs) { #ifndef SAL_LOG_INFO @@ -185,8 +184,6 @@ bool IsDiacritic( sal_UCS4 nChar ) return false; } - - int GetVerticalFlags( sal_UCS4 nChar ) { if( (nChar >= 0x1100 && nChar <= 0x11f9) // Hangul Jamo @@ -215,23 +212,17 @@ int GetVerticalFlags( sal_UCS4 nChar ) return GF_NONE; // not rotated as default } - - sal_UCS4 GetVerticalChar( sal_UCS4 ) { return 0; // #i14788# input method is responsible vertical char changes } - - VCL_DLLPUBLIC sal_UCS4 GetMirroredChar( sal_UCS4 nChar ) { nChar = u_charMirror( nChar ); return nChar; } - - VCL_DLLPUBLIC sal_UCS4 GetLocalizedChar( sal_UCS4 nChar, LanguageType eLang ) { // currently only conversion from ASCII digits is interesting @@ -324,8 +315,6 @@ VCL_DLLPUBLIC sal_UCS4 GetLocalizedChar( sal_UCS4 nChar, LanguageType eLang ) return nChar; } - - inline bool IsControlChar( sal_UCS4 cChar ) { // C0 control characters @@ -347,8 +336,6 @@ inline bool IsControlChar( sal_UCS4 cChar ) return false; } - - bool ImplLayoutRuns::AddPos( int nCharPos, bool bRTL ) { // check if charpos could extend current run @@ -376,8 +363,6 @@ bool ImplLayoutRuns::AddPos( int nCharPos, bool bRTL ) return true; } - - bool ImplLayoutRuns::AddRun( int nCharPos0, int nCharPos1, bool bRTL ) { if( nCharPos0 == nCharPos1 ) @@ -397,8 +382,6 @@ bool ImplLayoutRuns::AddRun( int nCharPos0, int nCharPos1, bool bRTL ) return true; } - - bool ImplLayoutRuns::PosIsInRun( int nCharPos ) const { if( mnRunIndex >= (int)maRuns.size() ) @@ -440,9 +423,6 @@ bool ImplLayoutRuns::PosIsInAnyRun( int nCharPos ) const return bRet; } - - - bool ImplLayoutRuns::GetNextPos( int* nCharPos, bool* bRightToLeft ) { // negative nCharPos => reset to first run @@ -487,8 +467,6 @@ bool ImplLayoutRuns::GetNextPos( int* nCharPos, bool* bRightToLeft ) return true; } - - bool ImplLayoutRuns::GetRun( int* nMinRunPos, int* nEndRunPos, bool* bRightToLeft ) const { if( mnRunIndex >= (int)maRuns.size() ) @@ -510,8 +488,6 @@ bool ImplLayoutRuns::GetRun( int* nMinRunPos, int* nEndRunPos, bool* bRightToLef return true; } - - ImplLayoutArgs::ImplLayoutArgs( const sal_Unicode* pStr, int nLen, int nMinCharPos, int nEndCharPos, int nFlags, const LanguageTag& rLanguageTag ) : @@ -583,8 +559,6 @@ ImplLayoutArgs::ImplLayoutArgs( const sal_Unicode* pStr, int nLen, maRuns.ResetPos(); } - - // add a run after splitting it up to get rid of control chars void ImplLayoutArgs::AddRun( int nCharPos0, int nCharPos1, bool bRTL ) { @@ -616,8 +590,6 @@ void ImplLayoutArgs::AddRun( int nCharPos0, int nCharPos1, bool bRTL ) maRuns.AddRun( nCharPos0, nCharPos1, bRTL ); } - - bool ImplLayoutArgs::PrepareFallback() { // short circuit if no fallback is needed @@ -665,8 +637,6 @@ bool ImplLayoutArgs::PrepareFallback() return true; } - - bool ImplLayoutArgs::GetNextRun( int* nMinRunPos, int* nEndRunPos, bool* bRTL ) { bool bValid = maRuns.GetRun( nMinRunPos, nEndRunPos, bRTL ); @@ -674,8 +644,6 @@ bool ImplLayoutArgs::GetNextRun( int* nMinRunPos, int* nEndRunPos, bool* bRTL ) return bValid; } - - SalLayout::SalLayout() : mnMinCharPos( -1 ), mnEndCharPos( -1 ), @@ -686,13 +654,9 @@ SalLayout::SalLayout() maDrawOffset( 0, 0 ) {} - - SalLayout::~SalLayout() {} - - void SalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) { mnMinCharPos = rArgs.mnMinCharPos; @@ -701,8 +665,6 @@ void SalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) mnOrientation = rArgs.mnOrientation; } - - void SalLayout::Release() const { // TODO: protect when multiple threads can access this @@ -712,8 +674,6 @@ void SalLayout::Release() const delete const_cast<SalLayout*>(this); } - - Point SalLayout::GetDrawPosition( const Point& rRelative ) const { Point aPos = maDrawBase; @@ -744,8 +704,6 @@ Point SalLayout::GetDrawPosition( const Point& rRelative ) const return aPos; } - - // returns asian kerning values in quarter of character width units // to enable automatic halfwidth substitution for fullwidth punctuation // return value is negative for l, positive for r, zero for neutral @@ -787,8 +745,6 @@ int SalLayout::CalcAsianKerning( sal_UCS4 c, bool bLeft, bool /*TODO:? bVertical return nResult; } - - bool SalLayout::GetOutline( SalGraphics& rSalGraphics, ::basegfx::B2DPolyPolygonVector& rVector ) const { @@ -823,8 +779,6 @@ bool SalLayout::GetOutline( SalGraphics& rSalGraphics, return (bAllOk && bOneOk); } - - bool SalLayout::GetBoundRect( SalGraphics& rSalGraphics, Rectangle& rRect ) const { bool bRet = false; @@ -854,8 +808,6 @@ bool SalLayout::GetBoundRect( SalGraphics& rSalGraphics, Rectangle& rRect ) cons return bRet; } - - bool SalLayout::IsSpacingGlyph( sal_GlyphId nGlyph ) const { bool bRet = false; @@ -872,25 +824,17 @@ bool SalLayout::IsSpacingGlyph( sal_GlyphId nGlyph ) const return bRet; } - - GenericSalLayout::GenericSalLayout() {} - - GenericSalLayout::~GenericSalLayout() {} - - void GenericSalLayout::AppendGlyph( const GlyphItem& rGlyphItem ) { m_GlyphItems.push_back(rGlyphItem); } - - bool GenericSalLayout::GetCharWidths( sal_Int32* pCharWidths ) const { // initialize character extents buffer @@ -965,8 +909,6 @@ bool GenericSalLayout::GetCharWidths( sal_Int32* pCharWidths ) const return true; } - - long GenericSalLayout::FillDXArray( sal_Int32* pCharWidths ) const { if( pCharWidths ) @@ -977,8 +919,6 @@ long GenericSalLayout::FillDXArray( sal_Int32* pCharWidths ) const return nWidth; } - - // the text width is the maximum logical extent of all glyphs long GenericSalLayout::GetTextWidth() const { @@ -1004,8 +944,6 @@ long GenericSalLayout::GetTextWidth() const return nWidth; } - - void GenericSalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) { SalLayout::AdjustLayout( rArgs ); @@ -1016,8 +954,6 @@ void GenericSalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) Justify( rArgs.mnLayoutWidth ); } - - // This DXArray thing is one of the stupidest ideas I have ever seen (I've been // told that it probably a one-to-one mapping of some Windows 3.1 API, which is // telling). To justify a text string, Writer calls OutputDevice::GetTextArray() @@ -1144,8 +1080,6 @@ void GenericSalLayout::ApplyDXArray( ImplLayoutArgs& rArgs ) } } - - void GenericSalLayout::Justify( long nNewWidth ) { nNewWidth *= mnUnitsPerPixel; @@ -1222,8 +1156,6 @@ void GenericSalLayout::Justify( long nNewWidth ) } } - - void GenericSalLayout::ApplyAsianKerning( const sal_Unicode* pStr, int nLength ) { long nOffset = 0; @@ -1264,8 +1196,6 @@ void GenericSalLayout::ApplyAsianKerning( const sal_Unicode* pStr, int nLength ) } } - - void GenericSalLayout::KashidaJustify( long nKashidaIndex, int nKashidaWidth ) { // TODO: reimplement method when container type for GlyphItems changes @@ -1317,8 +1247,6 @@ void GenericSalLayout::KashidaJustify( long nKashidaIndex, int nKashidaWidth ) } } - - void GenericSalLayout::GetCaretPositions( int nMaxIndex, sal_Int32* pCaretXArray ) const { // initialize result array @@ -1349,8 +1277,6 @@ void GenericSalLayout::GetCaretPositions( int nMaxIndex, sal_Int32* pCaretXArray } } - - sal_Int32 GenericSalLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) const { int nCharCapacity = mnEndCharPos - mnMinCharPos; @@ -1370,8 +1296,6 @@ sal_Int32 GenericSalLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int n return -1; } - - int GenericSalLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos, int& nStart, sal_Int32* pGlyphAdvAry, int* pCharPosAry, const PhysicalFontFace** /*pFallbackFonts*/ ) const @@ -1458,8 +1382,6 @@ int GenericSalLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos return nCount; } - - void GenericSalLayout::MoveGlyph( int nStart, long nNewXPos ) { if( nStart >= (int)m_GlyphItems.size() ) @@ -1485,8 +1407,6 @@ void GenericSalLayout::MoveGlyph( int nStart, long nNewXPos ) } } - - void GenericSalLayout::DropGlyph( int nStart ) { if( nStart >= (int)m_GlyphItems.size()) @@ -1498,8 +1418,6 @@ void GenericSalLayout::DropGlyph( int nStart ) pG->mnCharPos = -1; } - - void GenericSalLayout::Simplify( bool bIsBase ) { const sal_GlyphId nDropMarker = bIsBase ? GF_DROPPED : 0; @@ -1520,8 +1438,6 @@ void GenericSalLayout::Simplify( bool bIsBase ) m_GlyphItems.erase(m_GlyphItems.begin() + j, m_GlyphItems.end()); } - - // make sure GlyphItems are sorted left to right void GenericSalLayout::SortGlyphItems() { @@ -1557,8 +1473,6 @@ void GenericSalLayout::SortGlyphItems() } } - - MultiSalLayout::MultiSalLayout( SalLayout& rBaseLayout, const PhysicalFontFace* pBaseFont ) : SalLayout() , mnLevel( 1 ) @@ -1576,16 +1490,12 @@ void MultiSalLayout::SetInComplete(bool bInComplete) maFallbackRuns[mnLevel-1] = ImplLayoutRuns(); } - - MultiSalLayout::~MultiSalLayout() { for( int i = 0; i < mnLevel; ++i ) mpLayouts[ i ]->Release(); } - - bool MultiSalLayout::AddFallback( SalLayout& rFallback, ImplLayoutRuns& rFallbackRuns, const PhysicalFontFace* pFallbackFont ) { @@ -1599,8 +1509,6 @@ bool MultiSalLayout::AddFallback( SalLayout& rFallback, return true; } - - bool MultiSalLayout::LayoutText( ImplLayoutArgs& rArgs ) { if( mnLevel <= 1 ) @@ -1610,8 +1518,6 @@ bool MultiSalLayout::LayoutText( ImplLayoutArgs& rArgs ) return true; } - - void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) { SalLayout::AdjustLayout( rArgs ); @@ -1979,16 +1885,12 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) mpLayouts[n]->DisableGlyphInjection( false ); } - - void MultiSalLayout::InitFont() const { if( mnLevel > 0 ) mpLayouts[0]->InitFont(); } - - void MultiSalLayout::DrawText( SalGraphics& rGraphics ) const { for( int i = mnLevel; --i >= 0; ) @@ -2004,8 +1906,6 @@ void MultiSalLayout::DrawText( SalGraphics& rGraphics ) const // NOTE: now the baselevel font is active again } - - sal_Int32 MultiSalLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) const { if( mnLevel <= 0 ) @@ -2043,8 +1943,6 @@ sal_Int32 MultiSalLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFa return -1; } - - long MultiSalLayout::FillDXArray( sal_Int32* pCharWidths ) const { long nMaxWidth = 0; @@ -2091,8 +1989,6 @@ long MultiSalLayout::FillDXArray( sal_Int32* pCharWidths ) const return nMaxWidth; } - - void MultiSalLayout::GetCaretPositions( int nMaxIndex, sal_Int32* pCaretXArray ) const { SalLayout& rLayout = *mpLayouts[ 0 ]; @@ -2117,8 +2013,6 @@ void MultiSalLayout::GetCaretPositions( int nMaxIndex, sal_Int32* pCaretXArray ) } } - - int MultiSalLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdxAry, Point& rPos, int& nStart, sal_Int32* pGlyphAdvAry, int* pCharPosAry, const PhysicalFontFace** pFallbackFonts ) const @@ -2167,8 +2061,6 @@ int MultiSalLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdxAry, Point& r return 0; } - - bool MultiSalLayout::GetOutline( SalGraphics& rGraphics, ::basegfx::B2DPolyPolygonVector& rPPV ) const { diff --git a/vcl/source/gdi/salnativewidgets-none.cxx b/vcl/source/gdi/salnativewidgets-none.cxx index bdb9fb3ea09a..baa2cb398930 100644 --- a/vcl/source/gdi/salnativewidgets-none.cxx +++ b/vcl/source/gdi/salnativewidgets-none.cxx @@ -17,15 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <salgdi.hxx> - /**************************************************************** * Placeholder for no native widgets ***************************************************************/ - /* * IsNativeControlSupported() * @@ -37,7 +34,6 @@ bool SalGraphics::IsNativeControlSupported( ControlType, ControlPart ) return false; } - /* * HitTestNativeControl() * @@ -54,7 +50,6 @@ bool SalGraphics::hitTestNativeControl( ControlType, return false; } - /* * DrawNativeControl() * diff --git a/vcl/source/gdi/svgdata.cxx b/vcl/source/gdi/svgdata.cxx index fa3ebdf1e1d5..4080f5d36d67 100644 --- a/vcl/source/gdi/svgdata.cxx +++ b/vcl/source/gdi/svgdata.cxx @@ -29,12 +29,8 @@ #include <vcl/svapp.hxx> #include <vcl/outdev.hxx> - - using namespace ::com::sun::star; - - BitmapEx VCL_DLLPUBLIC convertPrimitive2DSequenceToBitmapEx( const Primitive2DSequence& rSequence, const basegfx::B2DRange& rTargetRange, @@ -91,8 +87,6 @@ BitmapEx VCL_DLLPUBLIC convertPrimitive2DSequenceToBitmapEx( return aRetval; } - - void SvgData::ensureReplacement() { ensureSequenceAndRange(); @@ -103,8 +97,6 @@ void SvgData::ensureReplacement() } } - - void SvgData::ensureSequenceAndRange() { if(!maSequence.hasElements() && mnSvgDataArrayLength) @@ -160,8 +152,6 @@ void SvgData::ensureSequenceAndRange() } } - - SvgData::SvgData(const SvgDataArray& rSvgDataArray, sal_uInt32 nSvgDataArrayLength, const OUString& rPath) : maSvgDataArray(rSvgDataArray), mnSvgDataArrayLength(nSvgDataArrayLength), @@ -172,7 +162,6 @@ SvgData::SvgData(const SvgDataArray& rSvgDataArray, sal_uInt32 nSvgDataArrayLeng { } - SvgData::SvgData(const OUString& rPath): maSvgDataArray(), mnSvgDataArrayLength(0), @@ -200,8 +189,6 @@ SvgData::SvgData(const OUString& rPath): } } - - const basegfx::B2DRange& SvgData::getRange() const { const_cast< SvgData* >(this)->ensureSequenceAndRange(); @@ -209,8 +196,6 @@ const basegfx::B2DRange& SvgData::getRange() const return maRange; } - - const Primitive2DSequence& SvgData::getPrimitive2DSequence() const { const_cast< SvgData* >(this)->ensureSequenceAndRange(); @@ -218,8 +203,6 @@ const Primitive2DSequence& SvgData::getPrimitive2DSequence() const return maSequence; } - - const BitmapEx& SvgData::getReplacement() const { const_cast< SvgData* >(this)->ensureReplacement(); diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx index b54a0421bfd7..35010b17ae97 100644 --- a/vcl/source/gdi/textlayout.cxx +++ b/vcl/source/gdi/textlayout.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/ctrl.hxx" #include "vcl/outdev.hxx" diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index 1b3fba203211..856a35893dd5 100644 --- a/vcl/source/gdi/virdev.cxx +++ b/vcl/source/gdi/virdev.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/debug.hxx> #include <vcl/settings.hxx> @@ -368,8 +367,6 @@ bool VirtualDevice::InnerImplSetOutputSizePixel( const Size& rNewSize, bool bEra return bRet; } - - // #i32109#: Fill opaque areas correctly (without relying on // fill/linecolor state) void VirtualDevice::ImplFillOpaqueRectangle( const Rectangle& rRect ) @@ -384,8 +381,6 @@ void VirtualDevice::ImplFillOpaqueRectangle( const Rectangle& rRect ) Pop(); } - - bool VirtualDevice::ImplSetOutputSizePixel( const Size& rNewSize, bool bErase, const basebmp::RawMemorySharedArray &pBuffer ) { if( InnerImplSetOutputSizePixel(rNewSize, bErase, pBuffer) ) diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx index af7a3a0f20b6..8891165fc966 100644 --- a/vcl/source/gdi/wall.cxx +++ b/vcl/source/gdi/wall.cxx @@ -28,8 +28,6 @@ #include <vcl/dibtools.hxx> #include <vcl/settings.hxx> - - ImplWallpaper::ImplWallpaper() : maColor( COL_TRANSPARENT ) { @@ -41,8 +39,6 @@ ImplWallpaper::ImplWallpaper() : meStyle = WALLPAPER_NULL; } - - ImplWallpaper::ImplWallpaper( const ImplWallpaper& rImplWallpaper ) : maColor( rImplWallpaper.maColor ) { @@ -67,8 +63,6 @@ ImplWallpaper::ImplWallpaper( const ImplWallpaper& rImplWallpaper ) : mpRect = NULL; } - - ImplWallpaper::~ImplWallpaper() { delete mpBitmap; @@ -77,8 +71,6 @@ ImplWallpaper::~ImplWallpaper() delete mpRect; } - - void ImplWallpaper::ImplSetCachedBitmap( BitmapEx& rBmp ) { if( !mpCache ) @@ -87,16 +79,12 @@ void ImplWallpaper::ImplSetCachedBitmap( BitmapEx& rBmp ) *mpCache = rBmp; } - - void ImplWallpaper::ImplReleaseCachedBitmap() { delete mpCache; mpCache = NULL; } - - SvStream& ReadImplWallpaper( SvStream& rIStm, ImplWallpaper& rImplWallpaper ) { VersionCompat aCompat( rIStm, STREAM_READ ); @@ -150,8 +138,6 @@ SvStream& ReadImplWallpaper( SvStream& rIStm, ImplWallpaper& rImplWallpaper ) return rIStm; } - - SvStream& WriteImplWallpaper( SvStream& rOStm, const ImplWallpaper& rImplWallpaper ) { VersionCompat aCompat( rOStm, STREAM_WRITE, 3 ); @@ -182,8 +168,6 @@ SvStream& WriteImplWallpaper( SvStream& rOStm, const ImplWallpaper& rImplWallpap return rOStm; } - - inline void Wallpaper::ImplMakeUnique( bool bReleaseCache ) { // copy them if other references exist @@ -198,8 +182,6 @@ inline void Wallpaper::ImplMakeUnique( bool bReleaseCache ) mpImplWallpaper->ImplReleaseCachedBitmap(); } - - Wallpaper::Wallpaper() { @@ -209,8 +191,6 @@ Wallpaper::Wallpaper() mpImplWallpaper = &aStaticImplWallpaper; } - - Wallpaper::Wallpaper( const Wallpaper& rWallpaper ) { DBG_ASSERT( rWallpaper.mpImplWallpaper->mnRefCount < 0xFFFFFFFE, "Wallpaper: RefCount overflow" ); @@ -222,8 +202,6 @@ Wallpaper::Wallpaper( const Wallpaper& rWallpaper ) mpImplWallpaper->mnRefCount++; } - - Wallpaper::Wallpaper( const Color& rColor ) { @@ -232,8 +210,6 @@ Wallpaper::Wallpaper( const Color& rColor ) mpImplWallpaper->meStyle = WALLPAPER_TILE; } - - Wallpaper::Wallpaper( const BitmapEx& rBmpEx ) { @@ -242,8 +218,6 @@ Wallpaper::Wallpaper( const BitmapEx& rBmpEx ) mpImplWallpaper->meStyle = WALLPAPER_TILE; } - - Wallpaper::Wallpaper( const Gradient& rGradient ) { @@ -252,8 +226,6 @@ Wallpaper::Wallpaper( const Gradient& rGradient ) mpImplWallpaper->meStyle = WALLPAPER_TILE; } - - Wallpaper::~Wallpaper() { // if ImpData are not static then delete them if it is the last reference, @@ -267,8 +239,6 @@ Wallpaper::~Wallpaper() } } - - void Wallpaper::SetColor( const Color& rColor ) { @@ -279,16 +249,12 @@ void Wallpaper::SetColor( const Color& rColor ) mpImplWallpaper->meStyle = WALLPAPER_TILE; } - - const Color& Wallpaper::GetColor() const { return mpImplWallpaper->maColor; } - - void Wallpaper::SetStyle( WallpaperStyle eStyle ) { @@ -302,16 +268,12 @@ void Wallpaper::SetStyle( WallpaperStyle eStyle ) mpImplWallpaper->meStyle = eStyle; } - - WallpaperStyle Wallpaper::GetStyle() const { return mpImplWallpaper->meStyle; } - - void Wallpaper::SetBitmap( const BitmapEx& rBitmap ) { @@ -337,8 +299,6 @@ void Wallpaper::SetBitmap( const BitmapEx& rBitmap ) mpImplWallpaper->meStyle = WALLPAPER_TILE; } - - BitmapEx Wallpaper::GetBitmap() const { @@ -351,17 +311,12 @@ BitmapEx Wallpaper::GetBitmap() const } } - - bool Wallpaper::IsBitmap() const { return (mpImplWallpaper->mpBitmap != 0); } - - - void Wallpaper::SetGradient( const Gradient& rGradient ) { @@ -376,8 +331,6 @@ void Wallpaper::SetGradient( const Gradient& rGradient ) mpImplWallpaper->meStyle = WALLPAPER_TILE; } - - Gradient Wallpaper::GetGradient() const { @@ -392,17 +345,12 @@ Gradient Wallpaper::GetGradient() const } } - - bool Wallpaper::IsGradient() const { return (mpImplWallpaper->mpGradient != 0); } - - - Gradient Wallpaper::ImplGetApplicationGradient() const { Gradient g; @@ -417,8 +365,6 @@ Gradient Wallpaper::ImplGetApplicationGradient() const return g; } - - void Wallpaper::SetRect( const Rectangle& rRect ) { @@ -441,8 +387,6 @@ void Wallpaper::SetRect( const Rectangle& rRect ) } } - - Rectangle Wallpaper::GetRect() const { @@ -455,17 +399,12 @@ Rectangle Wallpaper::GetRect() const } } - - bool Wallpaper::IsRect() const { return (mpImplWallpaper->mpRect != 0); } - - - bool Wallpaper::IsFixed() const { if ( mpImplWallpaper->meStyle == WALLPAPER_NULL ) @@ -474,8 +413,6 @@ bool Wallpaper::IsFixed() const return (!mpImplWallpaper->mpBitmap && !mpImplWallpaper->mpGradient); } - - bool Wallpaper::IsScrollable() const { if ( mpImplWallpaper->meStyle == WALLPAPER_NULL ) @@ -488,8 +425,6 @@ bool Wallpaper::IsScrollable() const return false; } - - Wallpaper& Wallpaper::operator=( const Wallpaper& rWallpaper ) { DBG_ASSERT( rWallpaper.mpImplWallpaper->mnRefCount < 0xFFFFFFFE, "Wallpaper: RefCount overflow" ); @@ -513,8 +448,6 @@ Wallpaper& Wallpaper::operator=( const Wallpaper& rWallpaper ) return *this; } - - bool Wallpaper::operator==( const Wallpaper& rWallpaper ) const { @@ -546,16 +479,12 @@ bool Wallpaper::operator==( const Wallpaper& rWallpaper ) const return true; } - - SvStream& ReadWallpaper( SvStream& rIStm, Wallpaper& rWallpaper ) { rWallpaper.ImplMakeUnique(); return ReadImplWallpaper( rIStm, *rWallpaper.mpImplWallpaper ); } - - SvStream& WriteWallpaper( SvStream& rOStm, const Wallpaper& rWallpaper ) { return WriteImplWallpaper( rOStm, *rWallpaper.mpImplWallpaper ); diff --git a/vcl/source/glyphs/graphite_features.cxx b/vcl/source/glyphs/graphite_features.cxx index 2e999b4aa66f..83a240508e46 100644 --- a/vcl/source/glyphs/graphite_features.cxx +++ b/vcl/source/glyphs/graphite_features.cxx @@ -22,7 +22,6 @@ // e.g. // 1001=1&2002=2&fav1=0 - #include <sal/types.h> #include <osl/endian.h> diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx index e3a293c970c5..7983ae3d7e1b 100644 --- a/vcl/source/glyphs/graphite_layout.cxx +++ b/vcl/source/glyphs/graphite_layout.cxx @@ -63,7 +63,6 @@ // Module private names. - #ifdef GRLAYOUT_DEBUG static FILE * grLog() { @@ -488,7 +487,6 @@ GraphiteLayout::append(gr_segment *pSeg, ImplLayoutArgs &rArgs, return cOrigin; } - // An implementation of the SalLayout interface to enable Graphite enabled fonts to be used. GraphiteLayout::GraphiteLayout(const gr_face * face, gr_font * font, @@ -548,7 +546,6 @@ bool GraphiteLayout::LayoutText(ImplLayoutArgs & rArgs) return success; } - gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& rArgs) { assert(rArgs.mnLength >= 0); diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx index 82af07a555f3..938a9769a738 100644 --- a/vcl/source/helper/canvasbitmap.cxx +++ b/vcl/source/helper/canvasbitmap.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/util/Endianness.hpp> #include <com/sun/star/rendering/ColorComponentTag.hpp> #include <com/sun/star/rendering/ColorSpaceType.hpp> @@ -34,7 +33,6 @@ #include <algorithm> - using namespace ::vcl::unotools; using namespace ::com::sun::star; diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx index c35548823895..f402e7f45b8d 100644 --- a/vcl/source/helper/canvastools.cxx +++ b/vcl/source/helper/canvastools.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <cppuhelper/compbase1.hxx> #include <com/sun/star/geometry/RealSize2D.hpp> @@ -62,7 +61,6 @@ #include <vcl/canvastools.hxx> #include <boost/unordered_map.hpp> - using namespace ::com::sun::star; namespace vcl @@ -330,7 +328,6 @@ namespace vcl return ::BitmapEx(); } - geometry::RealSize2D size2DFromSize( const Size& rSize ) { return geometry::RealSize2D( rSize.Width(), @@ -574,7 +571,6 @@ namespace vcl return new StandardColorSpace(); } - uno::Sequence< double > colorToStdColorSpaceSequence( const Color& rColor ) { uno::Sequence< double > aRet(4); @@ -633,7 +629,6 @@ namespace vcl toByteColor(aARGBColor.Blue) ); } - } // namespace vcltools } // namespace canvas diff --git a/vcl/source/helper/strhelper.cxx b/vcl/source/helper/strhelper.cxx index 53fd5b084429..16698d00034c 100644 --- a/vcl/source/helper/strhelper.cxx +++ b/vcl/source/helper/strhelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/strhelper.hxx" #include "sal/alloca.h" diff --git a/vcl/source/helper/xconnection.cxx b/vcl/source/helper/xconnection.cxx index 2a91d59ebbec..570bd7150e4a 100644 --- a/vcl/source/helper/xconnection.cxx +++ b/vcl/source/helper/xconnection.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/svapp.hxx" #include "xconnection.hxx" @@ -29,7 +28,6 @@ using namespace vcl; using namespace com::sun::star::uno; using namespace com::sun::star::awt; - DisplayConnection::DisplayConnection() { SalInstance::ConnectionIdentifierType eType; diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index 560ff0366f9b..2b47d3921977 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -465,7 +465,6 @@ bool OpenGLContext::initWindow() winData.nSize = sizeof(winData); m_pChildWindow.reset(new SystemChildWindow(m_pWindow.get(), 0, &winData, sal_False)); - if( m_pChildWindow ) { m_pChildWindow->SetMouseTransparent( sal_True ); diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx index 8c70510b111e..f331d80b3068 100644 --- a/vcl/source/window/accel.cxx +++ b/vcl/source/window/accel.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/debug.hxx> #include <tools/rc.h> @@ -27,15 +26,11 @@ #include <map> #include <vector> - - typedef ::std::map< sal_uLong, ImplAccelEntry* > ImplAccelMap; typedef ::std::vector< ImplAccelEntry* > ImplAccelList; #define ACCELENTRY_NOTFOUND ((sal_uInt16)0xFFFF) - - class ImplAccelData { public: @@ -43,11 +38,6 @@ public: ImplAccelList maIdList; // Id-List }; - - - - - sal_uInt16 ImplAccelEntryGetIndex( ImplAccelList* pList, sal_uInt16 nId, sal_uInt16* pIndex = NULL ) { @@ -95,8 +85,6 @@ sal_uInt16 ImplAccelEntryGetIndex( ImplAccelList* pList, sal_uInt16 nId, return ACCELENTRY_NOTFOUND; } - - static void ImplAccelEntryInsert( ImplAccelList* pList, ImplAccelEntry* pEntry ) { sal_uInt16 nInsIndex; @@ -134,8 +122,6 @@ static void ImplAccelEntryInsert( ImplAccelList* pList, ImplAccelEntry* pEntry ) } } - - static sal_uInt16 ImplAccelEntryGetFirstPos( ImplAccelList* pList, sal_uInt16 nId ) { sal_uInt16 nIndex = ImplAccelEntryGetIndex( pList, nId ); @@ -155,8 +141,6 @@ static sal_uInt16 ImplAccelEntryGetFirstPos( ImplAccelList* pList, sal_uInt16 nI return nIndex; } - - void Accelerator::ImplInit() { mnCurId = 0; @@ -165,8 +149,6 @@ void Accelerator::ImplInit() mpDel = NULL; } - - ImplAccelEntry* Accelerator::ImplGetAccelData( const KeyCode& rKeyCode ) const { ImplAccelMap::iterator it = mpData->maKeyMap.find( rKeyCode.GetFullCode() ); @@ -176,8 +158,6 @@ ImplAccelEntry* Accelerator::ImplGetAccelData( const KeyCode& rKeyCode ) const return NULL; } - - void Accelerator::ImplCopyData( ImplAccelData& rAccelData ) { // copy table @@ -199,8 +179,6 @@ void Accelerator::ImplCopyData( ImplAccelData& rAccelData ) } } - - void Accelerator::ImplDeleteData() { // delete accelerator-entries using the id-table @@ -214,8 +192,6 @@ void Accelerator::ImplDeleteData() mpData->maIdList.clear(); } - - void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, const KeyCode& rKeyCode, bool bEnable, Accelerator* pAutoAccel ) { @@ -269,8 +245,6 @@ void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, const KeyCode& rKeyCode, ImplAccelEntryInsert( &(mpData->maIdList), pEntry ); } - - Accelerator::Accelerator() { @@ -278,8 +252,6 @@ Accelerator::Accelerator() mpData = new ImplAccelData; } - - Accelerator::Accelerator( const Accelerator& rAccel ) : Resource(), maHelpStr( rAccel.maHelpStr ), @@ -291,8 +263,6 @@ Accelerator::Accelerator( const Accelerator& rAccel ) : ImplCopyData( *((ImplAccelData*)(rAccel.mpData)) ); } - - Accelerator::Accelerator( const ResId& rResId ) { @@ -302,8 +272,6 @@ Accelerator::Accelerator( const ResId& rResId ) ImplLoadRes( rResId ); } - - void Accelerator::ImplLoadRes( const ResId& rResId ) { GetRes( rResId ); @@ -318,8 +286,6 @@ void Accelerator::ImplLoadRes( const ResId& rResId ) } } - - Accelerator::~Accelerator() { @@ -331,36 +297,26 @@ Accelerator::~Accelerator() delete mpData; } - - void Accelerator::Activate() { maActivateHdl.Call( this ); } - - void Accelerator::Deactivate() { maDeactivateHdl.Call( this ); } - - void Accelerator::Select() { maSelectHdl.Call( this ); } - - void Accelerator::InsertItem( sal_uInt16 nItemId, const KeyCode& rKeyCode ) { ImplInsertAccel( nItemId, rKeyCode, true, NULL ); } - - void Accelerator::InsertItem( const ResId& rResId ) { @@ -393,16 +349,12 @@ void Accelerator::InsertItem( const ResId& rResId ) ImplInsertAccel( nAccelKeyId, aKeyCode, !bDisable, pAutoAccel ); } - - sal_uInt16 Accelerator::GetItemCount() const { return (sal_uInt16)mpData->maIdList.size(); } - - KeyCode Accelerator::GetKeyCode( sal_uInt16 nItemId ) const { @@ -413,8 +365,6 @@ KeyCode Accelerator::GetKeyCode( sal_uInt16 nItemId ) const return KeyCode(); } - - sal_uInt16 Accelerator::GetItemId( sal_uInt16 nPos ) const { @@ -425,8 +375,6 @@ sal_uInt16 Accelerator::GetItemId( sal_uInt16 nPos ) const return 0; } - - Accelerator* Accelerator::GetAccel( sal_uInt16 nItemId ) const { @@ -437,8 +385,6 @@ Accelerator* Accelerator::GetAccel( sal_uInt16 nItemId ) const return NULL; } - - Accelerator& Accelerator::operator=( const Accelerator& rAccel ) { diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx index e3bccd74ca41..a5dfaba99e5b 100644 --- a/vcl/source/window/accmgr.cxx +++ b/vcl/source/window/accmgr.cxx @@ -17,26 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/debug.hxx> #include <accel.h> #include <vcl/accel.hxx> #include <accmgr.hxx> - - - - - ImplAccelManager::~ImplAccelManager() { delete mpAccelList; delete mpSequenceList; } - - bool ImplAccelManager::InsertAccel( Accelerator* pAccel ) { if ( !mpAccelList ) { @@ -53,8 +45,6 @@ bool ImplAccelManager::InsertAccel( Accelerator* pAccel ) return true; } - - void ImplAccelManager::RemoveAccel( Accelerator* pAccel ) { // do we have a list ? @@ -90,8 +80,6 @@ void ImplAccelManager::RemoveAccel( Accelerator* pAccel ) } } - - void ImplAccelManager::EndSequence( bool bCancel ) { // are we in a list ? @@ -118,8 +106,6 @@ void ImplAccelManager::EndSequence( bool bCancel ) mpSequenceList = NULL; } - - bool ImplAccelManager::IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepeat ) { Accelerator* pAccel; diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index aca945654858..4ec9579a9465 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -41,8 +41,6 @@ using namespace ::com::sun::star::uno; // useful caption height for title bar buttons #define MIN_CAPTION_HEIGHT 18 - - static void ImplGetPinImage( sal_uInt16 nStyle, bool bPinIn, Image& rImage ) { // load ImageList if not available yet @@ -79,8 +77,6 @@ static void ImplGetPinImage( sal_uInt16 nStyle, bool bPinIn, Image& rImage ) rImage = pSVData->maCtrlData.mpPinImgList->GetImage( nId ); } - - void Window::ImplCalcSymbolRect( Rectangle& rRect ) { // Add border, not shown in the non-default representation, @@ -99,8 +95,6 @@ void Window::ImplCalcSymbolRect( Rectangle& rRect ) rRect.Bottom() -= nExtraHeight; } - - static void ImplDrawBrdWinSymbol( OutputDevice* pDev, const Rectangle& rRect, SymbolType eSymbol ) { @@ -112,8 +106,6 @@ static void ImplDrawBrdWinSymbol( OutputDevice* pDev, pDev->GetSettings().GetStyleSettings().GetButtonTextColor(), 0 ); } - - static void ImplDrawBrdWinSymbolButton( OutputDevice* pDev, const Rectangle& rRect, SymbolType eSymbol, sal_uInt16 nState ) @@ -148,54 +140,37 @@ static void ImplDrawBrdWinSymbolButton( OutputDevice* pDev, ImplDrawBrdWinSymbol( pDev, aTempRect, eSymbol ); } - - - - // - ImplBorderWindowView - - ImplBorderWindowView::~ImplBorderWindowView() { } - - bool ImplBorderWindowView::MouseMove( const MouseEvent& ) { return false; } - - bool ImplBorderWindowView::MouseButtonDown( const MouseEvent& ) { return false; } - - bool ImplBorderWindowView::Tracking( const TrackingEvent& ) { return false; } - - OUString ImplBorderWindowView::RequestHelp( const Point&, Rectangle& ) { return OUString(); } - - Rectangle ImplBorderWindowView::GetMenuRect() const { return Rectangle(); } - - void ImplBorderWindowView::ImplInitTitle( ImplBorderFrameData* pData ) { ImplBorderWindow* pBorderWindow = pData->mpBorderWindow; @@ -230,8 +205,6 @@ void ImplBorderWindowView::ImplInitTitle( ImplBorderFrameData* pData ) } } - - sal_uInt16 ImplBorderWindowView::ImplHitTest( ImplBorderFrameData* pData, const Point& rPos ) { ImplBorderWindow* pBorderWindow = pData->mpBorderWindow; @@ -309,8 +282,6 @@ sal_uInt16 ImplBorderWindowView::ImplHitTest( ImplBorderFrameData* pData, const return 0; } - - bool ImplBorderWindowView::ImplMouseMove( ImplBorderFrameData* pData, const MouseEvent& rMEvt ) { sal_uInt16 oldCloseState = pData->mnCloseState; @@ -351,8 +322,6 @@ bool ImplBorderWindowView::ImplMouseMove( ImplBorderFrameData* pData, const Mous return true; } - - bool ImplBorderWindowView::ImplMouseButtonDown( ImplBorderFrameData* pData, const MouseEvent& rMEvt ) { ImplBorderWindow* pBorderWindow = pData->mpBorderWindow; @@ -471,8 +440,6 @@ bool ImplBorderWindowView::ImplMouseButtonDown( ImplBorderFrameData* pData, cons return true; } - - bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const TrackingEvent& rTEvt ) { ImplBorderWindow* pBorderWindow = pData->mpBorderWindow; @@ -924,8 +891,6 @@ bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const Track return true; } - - OUString ImplBorderWindowView::ImplRequestHelp( ImplBorderFrameData* pData, const Point& rPos, Rectangle& rHelpRect ) @@ -995,8 +960,6 @@ OUString ImplBorderWindowView::ImplRequestHelp( ImplBorderFrameData* pData, return aHelpStr; } - - long ImplBorderWindowView::ImplCalcTitleWidth( const ImplBorderFrameData* pData ) const { // title is not visible therefore no width @@ -1016,24 +979,16 @@ long ImplBorderWindowView::ImplCalcTitleWidth( const ImplBorderFrameData* pData return nTitleWidth; } - - - // - ImplNoBorderWindowView - - ImplNoBorderWindowView::ImplNoBorderWindowView( ImplBorderWindow* ) { } - - void ImplNoBorderWindowView::Init( OutputDevice*, long, long ) { } - - void ImplNoBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const { @@ -1043,27 +998,17 @@ void ImplNoBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopB rBottomBorder = 0; } - - long ImplNoBorderWindowView::CalcTitleWidth() const { return 0; } - - void ImplNoBorderWindowView::DrawWindow( sal_uInt16, OutputDevice*, const Point* ) { } - - - // - ImplSmallBorderWindowView - - - - ImplSmallBorderWindowView::ImplSmallBorderWindowView( ImplBorderWindow* pBorderWindow ) : mpBorderWindow(pBorderWindow) , mnLeftBorder(0) @@ -1073,8 +1018,6 @@ ImplSmallBorderWindowView::ImplSmallBorderWindowView( ImplBorderWindow* pBorderW { } - - void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHeight ) { mpOutDev = pDev; @@ -1234,8 +1177,6 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei } } - - void ImplSmallBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const { @@ -1245,15 +1186,11 @@ void ImplSmallBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rT rBottomBorder = mnBottomBorder; } - - long ImplSmallBorderWindowView::CalcTitleWidth() const { return 0; } - - void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice*, const Point* ) { sal_uInt16 nBorderStyle = mpBorderWindow->GetBorderStyle(); @@ -1414,12 +1351,8 @@ void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* } } - - - // - ImplStdBorderWindowView - - ImplStdBorderWindowView::ImplStdBorderWindowView( ImplBorderWindow* pBorderWindow ) { maFrameData.mpBorderWindow = pBorderWindow; @@ -1438,51 +1371,37 @@ ImplStdBorderWindowView::ImplStdBorderWindowView( ImplBorderWindow* pBorderWindo mpDTitleVirDev = NULL; } - - ImplStdBorderWindowView::~ImplStdBorderWindowView() { delete mpATitleVirDev; delete mpDTitleVirDev; } - - bool ImplStdBorderWindowView::MouseMove( const MouseEvent& rMEvt ) { return ImplMouseMove( &maFrameData, rMEvt ); } - - bool ImplStdBorderWindowView::MouseButtonDown( const MouseEvent& rMEvt ) { return ImplMouseButtonDown( &maFrameData, rMEvt ); } - - bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt ) { return ImplTracking( &maFrameData, rTEvt ); } - - OUString ImplStdBorderWindowView::RequestHelp( const Point& rPos, Rectangle& rHelpRect ) { return ImplRequestHelp( &maFrameData, rPos, rHelpRect ); } - - Rectangle ImplStdBorderWindowView::GetMenuRect() const { return maFrameData.maMenuRect; } - - void ImplStdBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHeight ) { ImplBorderFrameData* pData = &maFrameData; @@ -1629,8 +1548,6 @@ void ImplStdBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHeigh } } - - void ImplStdBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const { @@ -1640,15 +1557,11 @@ void ImplStdBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTop rBottomBorder = maFrameData.mnBottomBorder; } - - long ImplStdBorderWindowView::CalcTitleWidth() const { return ImplCalcTitleWidth( &maFrameData ); } - - void ImplStdBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* pOutDev, const Point* pOffset ) { ImplBorderFrameData* pData = &maFrameData; @@ -1734,7 +1647,6 @@ void ImplStdBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* p aTitleRect.Move( pOffset->X(), pOffset->Y() ); pDev->DrawRect( aTitleRect ); - if ( pData->mnTitleType != BORDERWINDOW_TITLE_TEAROFF ) { aInRect.Left() += 2; @@ -1846,8 +1758,6 @@ void ImplStdBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* p } } - - void ImplBorderWindow::ImplInit( Window* pParent, WinBits nStyle, sal_uInt16 nTypeStyle, const ::com::sun::star::uno::Any& ) @@ -1933,8 +1843,6 @@ void ImplBorderWindow::ImplInit( Window* pParent, InitView(); } - - ImplBorderWindow::ImplBorderWindow( Window* pParent, SystemParentData* pSystemParentData, WinBits nStyle, sal_uInt16 nTypeStyle @@ -1943,8 +1851,6 @@ ImplBorderWindow::ImplBorderWindow( Window* pParent, ImplInit( pParent, nStyle, nTypeStyle, pSystemParentData ); } - - ImplBorderWindow::ImplBorderWindow( Window* pParent, WinBits nStyle , sal_uInt16 nTypeStyle ) : Window( WINDOW_BORDERWINDOW ) @@ -1952,36 +1858,26 @@ ImplBorderWindow::ImplBorderWindow( Window* pParent, WinBits nStyle , ImplInit( pParent, nStyle, nTypeStyle, ::com::sun::star::uno::Any() ); } - - ImplBorderWindow::~ImplBorderWindow() { delete mpBorderView; } - - void ImplBorderWindow::MouseMove( const MouseEvent& rMEvt ) { mpBorderView->MouseMove( rMEvt ); } - - void ImplBorderWindow::MouseButtonDown( const MouseEvent& rMEvt ) { mpBorderView->MouseButtonDown( rMEvt ); } - - void ImplBorderWindow::Tracking( const TrackingEvent& rTEvt ) { mpBorderView->Tracking( rTEvt ); } - - void ImplBorderWindow::Paint( const Rectangle& ) { mpBorderView->DrawWindow( BORDERWINDOW_DRAW_ALL ); @@ -1992,16 +1888,12 @@ void ImplBorderWindow::Draw( const Rectangle&, OutputDevice* pOutDev, const Poin mpBorderView->DrawWindow( BORDERWINDOW_DRAW_ALL, pOutDev, &rPos ); } - - void ImplBorderWindow::Activate() { SetDisplayActive( true ); Window::Activate(); } - - void ImplBorderWindow::Deactivate() { // remove active windows from the ruler, also ignore the Deactivate @@ -2011,8 +1903,6 @@ void ImplBorderWindow::Deactivate() Window::Deactivate(); } - - void ImplBorderWindow::RequestHelp( const HelpEvent& rHEvt ) { // no keyboard help for border window @@ -2037,8 +1927,6 @@ void ImplBorderWindow::RequestHelp( const HelpEvent& rHEvt ) Window::RequestHelp( rHEvt ); } - - void ImplBorderWindow::Resize() { Size aSize = GetOutputSizePixel(); @@ -2091,8 +1979,6 @@ void ImplBorderWindow::Resize() Window::Resize(); } - - void ImplBorderWindow::StateChanged( StateChangedType nType ) { if ( (nType == STATE_CHANGE_TEXT) || @@ -2111,8 +1997,6 @@ void ImplBorderWindow::StateChanged( StateChangedType nType ) Window::StateChanged( nType ); } - - void ImplBorderWindow::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DATACHANGED_FONTS) || @@ -2127,8 +2011,6 @@ void ImplBorderWindow::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); } - - void ImplBorderWindow::InitView() { if ( mbSmallOutBorder ) @@ -2148,8 +2030,6 @@ void ImplBorderWindow::InitView() mpBorderView->Init( this, aSize.Width(), aSize.Height() ); } - - void ImplBorderWindow::UpdateView( bool bNewView, const Size& rNewOutSize ) { sal_Int32 nLeftBorder; @@ -2191,8 +2071,6 @@ void ImplBorderWindow::UpdateView( bool bNewView, const Size& rNewOutSize ) } } - - void ImplBorderWindow::InvalidateBorder() { if ( IsReallyVisible() ) @@ -2224,8 +2102,6 @@ void ImplBorderWindow::InvalidateBorder() } } - - void ImplBorderWindow::SetDisplayActive( bool bActive ) { if ( mbDisplayActive != bActive ) @@ -2236,16 +2112,12 @@ void ImplBorderWindow::SetDisplayActive( bool bActive ) } } - - void ImplBorderWindow::SetTitleType( sal_uInt16 nTitleType, const Size& rSize ) { mnTitleType = nTitleType; UpdateView( false, rSize ); } - - void ImplBorderWindow::SetBorderStyle( sal_uInt16 nStyle ) { if ( !mbFrameBorder && (mnBorderStyle != nStyle) ) @@ -2255,16 +2127,12 @@ void ImplBorderWindow::SetBorderStyle( sal_uInt16 nStyle ) } } - - void ImplBorderWindow::SetPin( bool bPin ) { mbPinned = bPin; InvalidateBorder(); } - - void ImplBorderWindow::SetRollUp( bool bRollUp, const Size& rSize ) { mbRollUp = bRollUp; @@ -2272,8 +2140,6 @@ void ImplBorderWindow::SetRollUp( bool bRollUp, const Size& rSize ) UpdateView( false, rSize ); } - - void ImplBorderWindow::SetCloser() { SetStyle( GetStyle() | WB_CLOSEABLE ); @@ -2282,8 +2148,6 @@ void ImplBorderWindow::SetCloser() InvalidateBorder(); } - - void ImplBorderWindow::SetDockButton( bool bDockButton ) { mbDockBtn = bDockButton; @@ -2292,8 +2156,6 @@ void ImplBorderWindow::SetDockButton( bool bDockButton ) InvalidateBorder(); } - - void ImplBorderWindow::SetHideButton( bool bHideButton ) { mbHideBtn = bHideButton; @@ -2302,8 +2164,6 @@ void ImplBorderWindow::SetHideButton( bool bHideButton ) InvalidateBorder(); } - - void ImplBorderWindow::SetMenuButton( bool bMenuButton ) { mbMenuBtn = bMenuButton; @@ -2312,15 +2172,11 @@ void ImplBorderWindow::SetMenuButton( bool bMenuButton ) InvalidateBorder(); } - - void ImplBorderWindow::UpdateMenuHeight() { Resize(); } - - void ImplBorderWindow::SetMenuBarWindow( Window* pWindow ) { mpMenuBarWindow = pWindow; @@ -2329,16 +2185,12 @@ void ImplBorderWindow::SetMenuBarWindow( Window* pWindow ) pWindow->Show(); } - - void ImplBorderWindow::SetMenuBarMode( bool bHide ) { mbMenuHide = bHide; UpdateMenuHeight(); } - - void ImplBorderWindow::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const { @@ -2347,8 +2199,6 @@ void ImplBorderWindow::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, rTopBorder += mpMenuBarWindow->GetSizePixel().Height(); } - - long ImplBorderWindow::CalcTitleWidth() const { return mpBorderView->CalcTitleWidth(); diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx index 9bc6a3eedccf..21e909f8765b 100644 --- a/vcl/source/window/btndlg.cxx +++ b/vcl/source/window/btndlg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/rc.h> #include <svdata.hxx> diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 6ba769d5864d..91a2b9769186 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -2879,7 +2879,6 @@ void VclBuilder::handleActionWidget(xmlreader::XmlReader &reader) set_response(sID, sResponse.toInt32()); } - void VclBuilder::collectAccelerator(xmlreader::XmlReader &reader, stringmap &rMap) { xmlreader::Span name; diff --git a/vcl/source/window/cmdevt.cxx b/vcl/source/window/cmdevt.cxx index 9c7f010931c7..803d7e24f64a 100644 --- a/vcl/source/window/cmdevt.cxx +++ b/vcl/source/window/cmdevt.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <string.h> #include <vcl/cmdevt.hxx> @@ -39,8 +38,6 @@ CommandExtTextInputData::CommandExtTextInputData( const OUString& rText, mbOnlyCursor = bOnlyCursor; } - - CommandExtTextInputData::CommandExtTextInputData( const CommandExtTextInputData& rData ) : maText( rData.maText ) { @@ -56,8 +53,6 @@ CommandExtTextInputData::CommandExtTextInputData( const CommandExtTextInputData& mbOnlyCursor = rData.mbOnlyCursor; } - - CommandExtTextInputData::~CommandExtTextInputData() { delete [] mpTextAttr; diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx index 669b05406070..3ccf0601bdca 100644 --- a/vcl/source/window/cursor.cxx +++ b/vcl/source/window/cursor.cxx @@ -27,9 +27,6 @@ #include <tools/poly.hxx> - - - struct ImplCursorData { AutoTimer maTimer; // Timer @@ -44,8 +41,6 @@ struct ImplCursorData Window* mpWindow; // Zugeordnetes Windows }; - - static void ImplCursorInvert( ImplCursorData* pData ) { Window* pWindow = pData->mpWindow; @@ -120,8 +115,6 @@ static void ImplCursorInvert( ImplCursorData* pData ) pWindow->EnableMapMode( bMapMode ); } - - void Cursor::ImplDraw() { if ( mpData && mpData->mpWindow && !mpData->mbCurVisible ) @@ -147,8 +140,6 @@ void Cursor::ImplDraw() } } - - void Cursor::ImplRestore() { if ( mpData && mpData->mbCurVisible ) @@ -257,8 +248,6 @@ void Cursor::ImplNew() } } - - IMPL_LINK_NOARG(Cursor, ImplTimerHdl) { if ( mpData->mbCurVisible ) @@ -268,8 +257,6 @@ IMPL_LINK_NOARG(Cursor, ImplTimerHdl) return 0; } - - Cursor::Cursor() { mpData = NULL; @@ -281,8 +268,6 @@ Cursor::Cursor() mbVisible = false; } - - Cursor::Cursor( const Cursor& rCursor ) : maSize( rCursor.maSize ), maPos( rCursor.maPos ) @@ -296,8 +281,6 @@ Cursor::Cursor( const Cursor& rCursor ) : mbVisible = rCursor.mbVisible; } - - Cursor::~Cursor() { if ( mpData ) @@ -309,8 +292,6 @@ Cursor::~Cursor() } } - - void Cursor::SetStyle( sal_uInt16 nStyle ) { if ( mnStyle != nStyle ) @@ -320,8 +301,6 @@ void Cursor::SetStyle( sal_uInt16 nStyle ) } } - - void Cursor::Show() { if ( !mbVisible ) @@ -331,8 +310,6 @@ void Cursor::Show() } } - - void Cursor::Hide() { if ( mbVisible ) @@ -342,8 +319,6 @@ void Cursor::Hide() } } - - void Cursor::SetWindow( Window* pWindow ) { if ( mpWindow != pWindow ) @@ -353,8 +328,6 @@ void Cursor::SetWindow( Window* pWindow ) } } - - void Cursor::SetPos( const Point& rPoint ) { if ( maPos != rPoint ) @@ -364,8 +337,6 @@ void Cursor::SetPos( const Point& rPoint ) } } - - void Cursor::SetSize( const Size& rSize ) { if ( maSize != rSize ) @@ -375,8 +346,6 @@ void Cursor::SetSize( const Size& rSize ) } } - - void Cursor::SetWidth( long nNewWidth ) { if ( maSize.Width() != nNewWidth ) @@ -386,8 +355,6 @@ void Cursor::SetWidth( long nNewWidth ) } } - - void Cursor::SetOrientation( short nNewOrientation ) { if ( mnOrientation != nNewOrientation ) @@ -397,8 +364,6 @@ void Cursor::SetOrientation( short nNewOrientation ) } } - - void Cursor::SetDirection( unsigned char nNewDirection ) { if ( mnDirection != nNewDirection ) @@ -408,8 +373,6 @@ void Cursor::SetDirection( unsigned char nNewDirection ) } } - - Cursor& Cursor::operator=( const Cursor& rCursor ) { maPos = rCursor.maPos; @@ -423,8 +386,6 @@ Cursor& Cursor::operator=( const Cursor& rCursor ) return *this; } - - bool Cursor::operator==( const Cursor& rCursor ) const { return diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx index df13ce4b8358..d16295e71a4c 100644 --- a/vcl/source/window/decoview.cxx +++ b/vcl/source/window/decoview.cxx @@ -23,15 +23,11 @@ #include <vcl/window.hxx> #include <vcl/ctrl.hxx> - - #define BUTTON_DRAW_FLATTEST (BUTTON_DRAW_FLAT | \ BUTTON_DRAW_PRESSED | \ BUTTON_DRAW_CHECKED | \ BUTTON_DRAW_HIGHLIGHT) - - namespace { long AdjustRectToSquare( Rectangle &rRect ) @@ -122,7 +118,6 @@ void ImplDrawSymbol( OutputDevice* pDev, Rectangle nRect, const SymbolType eType nRect.Right()-1, aCenter.Y()+n8 ) ); break; - case SYMBOL_SPIN_UP: nRect.Top() += n4; pDev->DrawPixel( Point( aCenter.X(), nRect.Top() ) ); @@ -423,7 +418,6 @@ void ImplDrawSymbol( OutputDevice* pDev, Rectangle nRect, const SymbolType eType } } - void ImplDrawDPILineRect( OutputDevice *const pDev, Rectangle& rRect, const Color *const pColor, const bool bRound = false ) { @@ -473,7 +467,6 @@ void ImplDrawDPILineRect( OutputDevice *const pDev, Rectangle& rRect, rRect.Bottom() -= nLineHeight; } - void ImplDraw2ColorFrame( OutputDevice *const pDev, Rectangle& rRect, const Color& rLeftTopColor, const Color& rRightBottomColor ) { @@ -491,7 +484,6 @@ void ImplDraw2ColorFrame( OutputDevice *const pDev, Rectangle& rRect, --rRect.Bottom(); } - void ImplDrawButton( OutputDevice *const pDev, Rectangle aFillRect, const sal_uInt16 nStyle ) { @@ -829,9 +821,6 @@ void ImplDrawFrame( OutputDevice *const pDev, Rectangle& rRect, } - - - void DecorationView::DrawSymbol( const Rectangle& rRect, SymbolType eType, const Color& rColor, sal_uInt16 nStyle ) { @@ -875,8 +864,6 @@ void DecorationView::DrawSymbol( const Rectangle& rRect, SymbolType eType, mpOutDev->EnableMapMode( bOldMapMode ); } - - void DecorationView::DrawFrame( const Rectangle& rRect, const Color& rLeftTopColor, const Color& rRightBottomColor ) @@ -890,8 +877,6 @@ void DecorationView::DrawFrame( const Rectangle& rRect, mpOutDev->EnableMapMode( bOldMapMode ); } - - void DecorationView::DrawHighlightFrame( const Rectangle& rRect, sal_uInt16 nStyle ) { @@ -940,8 +925,6 @@ void DecorationView::DrawHighlightFrame( const Rectangle& rRect, DrawFrame( rRect, aLightColor, aShadowColor ); } - - Rectangle DecorationView::DrawFrame( const Rectangle& rRect, sal_uInt16 nStyle ) { Rectangle aRect = rRect; @@ -975,8 +958,6 @@ Rectangle DecorationView::DrawFrame( const Rectangle& rRect, sal_uInt16 nStyle ) return aRect; } - - Rectangle DecorationView::DrawButton( const Rectangle& rRect, sal_uInt16 nStyle ) { if ( rRect.IsEmpty() ) @@ -1056,8 +1037,6 @@ Rectangle DecorationView::DrawButton( const Rectangle& rRect, sal_uInt16 nStyle return aRect; } - - void DecorationView::DrawSeparator( const Point& rStart, const Point& rStop, bool bVertical ) { Point aStart( rStart ), aStop( rStop ); diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index c8ea35aade49..a341a8326f70 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -367,7 +367,6 @@ void Dialog::ImplInit( Window* pParent, WinBits nStyle ) // Now, all Dialogs are per default system windows !!! nStyle |= WB_SYSTEMWINDOW; - // parent is NULL: get the default Dialog parent if ( !pParent ) { @@ -400,7 +399,6 @@ void Dialog::ImplInit( Window* pParent, WinBits nStyle ) else if( pParent == DIALOG_NO_PARENT ) pParent = NULL; - if ( !pParent || (nStyle & WB_SYSTEMWINDOW) || (pParent->mpWindowImpl->mpFrameData->mbNeedSysWindow && !(nSysWinMode & SYSTEMWINDOW_MODE_NOAUTOMODE)) || (nSysWinMode & SYSTEMWINDOW_MODE_DIALOG) ) @@ -1083,7 +1081,6 @@ void Dialog::SetModalInputMode( bool bModal ) // ensure continued modality of prev dialog // do not change modality counter - // #i119994# need find the last modal dialog before reactive it Dialog * pPrevModalDlg = mpPrevExecuteDlg; diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx index cb43d3431b70..2ff228b5f773 100644 --- a/vcl/source/window/dlgctrl.cxx +++ b/vcl/source/window/dlgctrl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/debug.hxx> #include <svdata.hxx> @@ -38,8 +37,6 @@ using namespace ::com::sun::star; - - static bool ImplHasIndirectTabParent( Window* pWindow ) { // The window has inderect tab parent if it is included in tab hierarchy @@ -50,8 +47,6 @@ static bool ImplHasIndirectTabParent( Window* pWindow ) && ( pNonLayoutParent->ImplGetWindow()->GetStyle() & WB_CHILDDLGCTRL ) ); } - - static Window* ImplGetTopParentOfTabHierarchy( Window* pParent ) { // The method allows to find the most close parent containing all the @@ -73,8 +68,6 @@ static Window* ImplGetTopParentOfTabHierarchy( Window* pParent ) return pResult; } - - static Window* ImplGetSubChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIndex ) { Window* pTabPage = NULL; @@ -144,8 +137,6 @@ static Window* ImplGetSubChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& return pFoundWindow; } - - static Window* ImplGetChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIndex, bool bTestEnable ) { pParent = ImplGetTopParentOfTabHierarchy( pParent ); @@ -178,8 +169,6 @@ static Window* ImplGetChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nI return pWindow; } - - static Window* ImplGetNextWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIndex, bool bTestEnable ) { Window* pWindow = ImplGetChildWindow( pParent, n+1, nIndex, bTestEnable ); @@ -191,8 +180,6 @@ static Window* ImplGetNextWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIn return pWindow; } - - Window* Window::ImplGetDlgWindow( sal_uInt16 nIndex, sal_uInt16 nType, sal_uInt16 nFormStart, sal_uInt16 nFormEnd, sal_uInt16* pIndex ) @@ -297,8 +284,6 @@ Window* Window::ImplGetDlgWindow( sal_uInt16 nIndex, sal_uInt16 nType, return pWindow; } - - static Window* ImplFindDlgCtrlWindow( Window* pParent, Window* pWindow, sal_uInt16& rIndex, sal_uInt16& rFormStart, sal_uInt16& rFormEnd ) { @@ -393,8 +378,6 @@ static Window* ImplFindDlgCtrlWindow( Window* pParent, Window* pWindow, sal_uInt return pSWindow; } - - static Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, sal_Unicode cCharCode, sal_uInt16 nFormStart, sal_uInt16 nFormEnd, bool bCheckEnable = true ) { @@ -485,8 +468,6 @@ static Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, sal_Uni return NULL; } - - void Window::ImplControlFocus( sal_uInt16 nFlags ) { if ( nFlags & GETFOCUS_MNEMONIC ) @@ -528,8 +509,6 @@ void Window::ImplControlFocus( sal_uInt16 nFlags ) } } - - namespace { bool isSuitableDestination(Window *pWindow) @@ -962,8 +941,6 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput ) return false; } - - // checks if this window has dialog control bool Window::ImplHasDlgCtrl() { @@ -1013,8 +990,6 @@ if ( !pDlgCtrlParent || (GetStyle() & WB_NODIALOGCONTROL) || ((pDlgCtrlParent->G pWindow->ImplControlFocus(); } - - static void ImplDlgCtrlUpdateDefButton( Window* pParent, Window* pFocusWindow, bool bGetFocus ) { @@ -1072,8 +1047,6 @@ static void ImplDlgCtrlUpdateDefButton( Window* pParent, Window* pFocusWindow, } } - - void Window::ImplDlgCtrlFocusChanged( Window* pWindow, bool bGetFocus ) { if ( mpWindowImpl->mpDlgCtrlDownWindow && !bGetFocus ) @@ -1085,8 +1058,6 @@ void Window::ImplDlgCtrlFocusChanged( Window* pWindow, bool bGetFocus ) ImplDlgCtrlUpdateDefButton( this, pWindow, bGetFocus ); } - - Window* Window::ImplFindDlgCtrlWindow( Window* pWindow ) { sal_uInt16 nIndex; @@ -1097,23 +1068,16 @@ Window* Window::ImplFindDlgCtrlWindow( Window* pWindow ) return ::ImplFindDlgCtrlWindow( this, pWindow, nIndex, nFormStart, nFormEnd ); } - - - Window* Window::GetParentLabelFor( const Window* ) const { return NULL; } - - Window* Window::GetParentLabeledBy( const Window* ) const { return NULL; } - - static sal_Unicode getAccel( const OUString& rStr ) { sal_Unicode nChar = 0; @@ -1215,8 +1179,6 @@ Window* Window::getLegacyNonLayoutAccessibleRelationLabelFor() const return pWindow; } - - static Window* ImplGetLabeledBy( Window* pFrameWindow, WindowType nMyType, Window* pLabeled ) { Window* pWindow = NULL; @@ -1357,8 +1319,6 @@ Window* Window::getLegacyNonLayoutAccessibleRelationMemberOf() const return pWindow; } - - KeyEvent Window::GetActivationKey() const { KeyEvent aKeyEvent; diff --git a/vcl/source/window/dndevdis.cxx b/vcl/source/window/dndevdis.cxx index 0e433ec165e4..449af42c0bc3 100644 --- a/vcl/source/window/dndevdis.cxx +++ b/vcl/source/window/dndevdis.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <dndevdis.hxx> #include <dndlcon.hxx> #include <window.h> @@ -33,20 +32,16 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::datatransfer; using namespace ::com::sun::star::datatransfer::dnd; - // DNDEventDispatcher::DNDEventDispatcher - DNDEventDispatcher::DNDEventDispatcher( Window * pTopWindow ): m_pTopWindow( pTopWindow ), m_pCurrentWindow( NULL ) { } - // DNDEventDispatcher::~DNDEventDispatcher - DNDEventDispatcher::~DNDEventDispatcher() { } @@ -76,10 +71,8 @@ Window* DNDEventDispatcher::findTopLevelWindow(Point location) return pChildWindow; } - // DNDEventDispatcher::drop - void SAL_CALL DNDEventDispatcher::drop( const DropTargetDropEvent& dtde ) throw(RuntimeException, std::exception) { @@ -116,10 +109,8 @@ void SAL_CALL DNDEventDispatcher::drop( const DropTargetDropEvent& dtde ) m_aDataFlavorList.realloc( 0 ); } - // DNDEventDispatcher::dragEnter - void SAL_CALL DNDEventDispatcher::dragEnter( const DropTargetDragEnterEvent& dtdee ) throw(RuntimeException, std::exception) { @@ -144,10 +135,8 @@ void SAL_CALL DNDEventDispatcher::dragEnter( const DropTargetDragEnterEvent& dtd } - // DNDEventDispatcher::dragExit - void SAL_CALL DNDEventDispatcher::dragExit( const DropTargetEvent& /*dte*/ ) throw(RuntimeException, std::exception) { @@ -160,10 +149,8 @@ void SAL_CALL DNDEventDispatcher::dragExit( const DropTargetEvent& /*dte*/ ) m_aDataFlavorList.realloc( 0 ); } - // DNDEventDispatcher::dragOver - void SAL_CALL DNDEventDispatcher::dragOver( const DropTargetDragEvent& dtde ) throw(RuntimeException, std::exception) { @@ -201,10 +188,8 @@ void SAL_CALL DNDEventDispatcher::dragOver( const DropTargetDragEvent& dtde ) } } - // DNDEventDispatcher::dropActionChanged - void SAL_CALL DNDEventDispatcher::dropActionChanged( const DropTargetDragEvent& dtde ) throw(RuntimeException, std::exception) { @@ -242,11 +227,8 @@ void SAL_CALL DNDEventDispatcher::dropActionChanged( const DropTargetDragEvent& } } - - // DNDEventDispatcher::dragGestureRecognized - void SAL_CALL DNDEventDispatcher::dragGestureRecognized( const DragGestureEvent& dge ) throw(RuntimeException, std::exception) { @@ -259,35 +241,27 @@ void SAL_CALL DNDEventDispatcher::dragGestureRecognized( const DragGestureEvent& fireDragGestureEvent( pChildWindow, dge.DragSource, dge.Event, origin, dge.DragAction ); } - // DNDEventDispatcher::disposing - void SAL_CALL DNDEventDispatcher::disposing( const EventObject& ) throw(RuntimeException, std::exception) { } - // DNDEventDispatcher::acceptDrag - void SAL_CALL DNDEventDispatcher::acceptDrag( sal_Int8 /*dropAction*/ ) throw(RuntimeException, std::exception) { } - // DNDEventDispatcher::rejectDrag - void SAL_CALL DNDEventDispatcher::rejectDrag() throw(RuntimeException, std::exception) { } - // DNDEventDispatcher::fireDragEnterEvent - sal_Int32 DNDEventDispatcher::fireDragEnterEvent( Window *pWindow, const Reference< XDropTargetDragContext >& xContext, const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceActions, const Sequence< DataFlavor >& aFlavorList @@ -320,10 +294,8 @@ sal_Int32 DNDEventDispatcher::fireDragEnterEvent( Window *pWindow, return n; } - // DNDEventDispatcher::fireDragOverEvent - sal_Int32 DNDEventDispatcher::fireDragOverEvent( Window *pWindow, const Reference< XDropTargetDragContext >& xContext, const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceActions @@ -353,10 +325,8 @@ sal_Int32 DNDEventDispatcher::fireDragOverEvent( Window *pWindow, return n; } - // DNDEventDispatcher::fireDragExitEvent - sal_Int32 DNDEventDispatcher::fireDragExitEvent( Window *pWindow ) throw(RuntimeException) { sal_Int32 n = 0; @@ -380,10 +350,8 @@ sal_Int32 DNDEventDispatcher::fireDragExitEvent( Window *pWindow ) throw(Runtime return n; } - // DNDEventDispatcher::fireDropActionChangedEvent - sal_Int32 DNDEventDispatcher::fireDropActionChangedEvent( Window *pWindow, const Reference< XDropTargetDragContext >& xContext, const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceActions @@ -413,10 +381,8 @@ sal_Int32 DNDEventDispatcher::fireDropActionChangedEvent( Window *pWindow, return n; } - // DNDEventDispatcher::fireDropEvent - sal_Int32 DNDEventDispatcher::fireDropEvent( Window *pWindow, const Reference< XDropTargetDropContext >& xContext, const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceActions, const Reference< XTransferable >& xTransferable @@ -458,10 +424,8 @@ sal_Int32 DNDEventDispatcher::fireDropEvent( Window *pWindow, return n; } - // DNDEventDispatcher::fireDragGestureRecognized - sal_Int32 DNDEventDispatcher::fireDragGestureEvent( Window *pWindow, const Reference< XDragSource >& xSource, const Any event, const Point& rOrigin, const sal_Int8 nDragAction diff --git a/vcl/source/window/dndlcon.cxx b/vcl/source/window/dndlcon.cxx index fee57ec8cb79..1f3459c371c4 100644 --- a/vcl/source/window/dndlcon.cxx +++ b/vcl/source/window/dndlcon.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <dndlcon.hxx> using namespace ::cppu; @@ -25,10 +24,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::datatransfer; using namespace ::com::sun::star::datatransfer::dnd; - - - - DNDListenerContainer::DNDListenerContainer( sal_Int8 nDefaultActions ) : WeakComponentImplHelper4< XDragGestureRecognizer, XDropTargetDragContext, XDropTargetDropContext, XDropTarget >(GetMutex()) { @@ -36,107 +31,83 @@ DNDListenerContainer::DNDListenerContainer( sal_Int8 nDefaultActions ) m_nDefaultActions = nDefaultActions; } - - - - DNDListenerContainer::~DNDListenerContainer() { } - // DNDListenerContainer::addDragGestureListener - void SAL_CALL DNDListenerContainer::addDragGestureListener( const Reference< XDragGestureListener >& dgl ) throw(RuntimeException, std::exception) { rBHelper.addListener( getCppuType( ( const Reference< XDragGestureListener > * ) 0 ), dgl ); } - // DNDListenerContainer::removeDragGestureListener - void SAL_CALL DNDListenerContainer::removeDragGestureListener( const Reference< XDragGestureListener >& dgl ) throw(RuntimeException, std::exception) { rBHelper.removeListener( getCppuType( ( const Reference< XDragGestureListener > * ) 0 ), dgl ); } - // DNDListenerContainer::resetRecognizer - void SAL_CALL DNDListenerContainer::resetRecognizer( ) throw(RuntimeException, std::exception) { } - // DNDListenerContainer::addDropTargetListener - void SAL_CALL DNDListenerContainer::addDropTargetListener( const Reference< XDropTargetListener >& dtl ) throw(RuntimeException, std::exception) { rBHelper.addListener( getCppuType( ( const Reference< XDropTargetListener > * ) 0 ), dtl ); } - // DNDListenerContainer::removeDropTargetListener - void SAL_CALL DNDListenerContainer::removeDropTargetListener( const Reference< XDropTargetListener >& dtl ) throw(RuntimeException, std::exception) { rBHelper.removeListener( getCppuType( ( const Reference< XDropTargetListener > * ) 0 ), dtl ); } - // DNDListenerContainer::isActive - sal_Bool SAL_CALL DNDListenerContainer::isActive( ) throw(RuntimeException, std::exception) { return m_bActive; } - // DNDListenerContainer::setActive - void SAL_CALL DNDListenerContainer::setActive( sal_Bool active ) throw(RuntimeException, std::exception) { m_bActive = active; } - // DNDListenerContainer::getDefaultActions - sal_Int8 SAL_CALL DNDListenerContainer::getDefaultActions( ) throw(RuntimeException, std::exception) { return m_nDefaultActions; } - // DNDListenerContainer::setDefaultActions - void SAL_CALL DNDListenerContainer::setDefaultActions( sal_Int8 actions ) throw(RuntimeException, std::exception) { m_nDefaultActions = actions; } - // DNDListenerContainer::fireDropEvent - sal_uInt32 DNDListenerContainer::fireDropEvent( const Reference< XDropTargetDropContext >& context, sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions, const Reference< XTransferable >& transferable ) @@ -206,10 +177,8 @@ sal_uInt32 DNDListenerContainer::fireDropEvent( const Reference< XDropTargetDrop return nRet; } - // DNDListenerContainer::fireDragExitEvent - sal_uInt32 DNDListenerContainer::fireDragExitEvent() { sal_uInt32 nRet = 0; @@ -250,10 +219,8 @@ sal_uInt32 DNDListenerContainer::fireDragExitEvent() return nRet; } - // DNDListenerContainer::fireDragOverEvent - sal_uInt32 DNDListenerContainer::fireDragOverEvent( const Reference< XDropTargetDragContext >& context, sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions ) { @@ -315,10 +282,8 @@ sal_uInt32 DNDListenerContainer::fireDragOverEvent( const Reference< XDropTarget return nRet; } - // DNDListenerContainer::fireDragEnterEvent - sal_uInt32 DNDListenerContainer::fireDragEnterEvent( const Reference< XDropTargetDragContext >& context, sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions, const Sequence< DataFlavor >& dataFlavors ) @@ -381,10 +346,8 @@ sal_uInt32 DNDListenerContainer::fireDragEnterEvent( const Reference< XDropTarge return nRet; } - // DNDListenerContainer::fireDropActionChangedEvent - sal_uInt32 DNDListenerContainer::fireDropActionChangedEvent( const Reference< XDropTargetDragContext >& context, sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions ) { @@ -446,10 +409,8 @@ sal_uInt32 DNDListenerContainer::fireDropActionChangedEvent( const Reference< XD return nRet; } - // DNDListenerContainer::fireDragGestureEvent - sal_uInt32 DNDListenerContainer::fireDragGestureEvent( sal_Int8 dragAction, sal_Int32 dragOriginX, sal_Int32 dragOriginY, const Reference< XDragSource >& dragSource, const Any& triggerEvent ) { @@ -492,10 +453,8 @@ sal_uInt32 DNDListenerContainer::fireDragGestureEvent( sal_Int8 dragAction, sal_ return nRet; } - // DNDListenerContainer::acceptDrag - void SAL_CALL DNDListenerContainer::acceptDrag( sal_Int8 dragOperation ) throw (RuntimeException, std::exception) { if( m_xDropTargetDragContext.is() ) @@ -505,38 +464,30 @@ void SAL_CALL DNDListenerContainer::acceptDrag( sal_Int8 dragOperation ) throw ( } } - // DNDListenerContainer::rejectDrag - void SAL_CALL DNDListenerContainer::rejectDrag( ) throw (RuntimeException, std::exception) { // nothing to do here } - // DNDListenerContainer::acceptDrop - void SAL_CALL DNDListenerContainer::acceptDrop( sal_Int8 dropOperation ) throw (RuntimeException, std::exception) { if( m_xDropTargetDropContext.is() ) m_xDropTargetDropContext->acceptDrop( dropOperation ); } - // DNDListenerContainer::rejectDrop - void SAL_CALL DNDListenerContainer::rejectDrop( ) throw (RuntimeException, std::exception) { // nothing to do here } - // DNDListenerContainer::dropComplete - void SAL_CALL DNDListenerContainer::dropComplete( sal_Bool success ) throw (RuntimeException, std::exception) { if( m_xDropTargetDropContext.is() ) diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx index e7c6d92a2fa1..6cdc73e08f9c 100644 --- a/vcl/source/window/dockingarea.cxx +++ b/vcl/source/window/dockingarea.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/dockingarea.hxx> #include <vcl/syswin.hxx> #include <vcl/menu.hxx> @@ -27,8 +26,6 @@ #include <map> - - class DockingAreaWindow::ImplData { public: @@ -47,8 +44,6 @@ DockingAreaWindow::ImplData::~ImplData() { } - - static void ImplInitBackground( DockingAreaWindow* pThis ) { const BitmapEx& rPersonaBitmap = Application::GetSettings().GetStyleSettings().GetPersonaHeader(); @@ -96,8 +91,6 @@ DockingAreaWindow::~DockingAreaWindow() delete mpImplData; } - - void DockingAreaWindow::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); @@ -109,8 +102,6 @@ void DockingAreaWindow::DataChanged( const DataChangedEvent& rDCEvt ) } } - - static void ImplInvalidateMenubar( DockingAreaWindow* pThis ) { // due to a possible comon gradient covering menubar and top dockingarea @@ -138,8 +129,6 @@ void DockingAreaWindow::StateChanged( StateChangedType nType ) ImplInvalidateMenubar( this ); } - - bool DockingAreaWindow::IsHorizontal() const { return ( mpImplData->meAlign == WINDOWALIGN_TOP || mpImplData->meAlign == WINDOWALIGN_BOTTOM ); @@ -160,8 +149,6 @@ WindowAlign DockingAreaWindow::GetAlign() const return mpImplData->meAlign; } - - void DockingAreaWindow::Paint( const Rectangle& ) { EnableNativeWidget( true ); // only required because the toolkit curently switches this flag off @@ -229,7 +216,6 @@ void DockingAreaWindow::Paint( const Rectangle& ) ranges[ aPos.X() ] = aSize.Width(); } - // draw multiple toolbar backgrounds, i.e., one for each toolbar line for( std::map<int,int>::const_iterator it = ranges.begin(); it != ranges.end(); ++it ) { @@ -263,6 +249,4 @@ void DockingAreaWindow::Resize() Invalidate(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index c4f369d9e667..a382e809b595 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/time.hxx> #include <tools/rc.h> @@ -36,7 +35,6 @@ #include <vcl/unowrap.hxx> #include <vcl/settings.hxx> - #define DOCKWIN_FLOATSTYLES (WB_SIZEABLE | WB_MOVEABLE | WB_CLOSEABLE | WB_STANDALONE | WB_PINABLE | WB_ROLLABLE ) class ImplDockFloatWin2 : public FloatingWindow @@ -154,7 +152,6 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, EndDockTimerHdl) return 0; } - IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl) { // called during move of a floating window @@ -228,7 +225,6 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl) return 0; } - void ImplDockFloatWin2::Move() { if( mbInMove ) @@ -461,11 +457,9 @@ Rectangle DockingManager::GetPosSizePixel( const Window *pWindow ) return aRect; } - // special floating window for popup mode // main purpose: provides tear-off area for undocking - // if TEAROFF_DASHED defined a single dashed line is used // otherwise multiple smaller lines will be painted //#define TEAROFF_DASHED @@ -555,7 +549,6 @@ Window* ImplPopupFloatWin::GetPreferredKeyInputWindow() return FloatingWindow::GetPreferredKeyInputWindow(); } - void ImplPopupFloatWin::ImplSetBorder() { // although we have no border in the sense of a borderwindow @@ -803,7 +796,6 @@ void ImplPopupFloatWin::Tracking( const TrackingEvent& rTEvt ) } } - ImplDockingWindowWrapper::ImplDockingWindowWrapper( const Window *pWindow ) { ImplInitData(); @@ -1220,7 +1212,6 @@ IMPL_LINK_NOARG(ImplDockingWindowWrapper, PopupModeEnd) return 0; } - bool ImplDockingWindowWrapper::IsInPopupMode() const { if( GetFloatingWindow() ) @@ -1377,10 +1368,8 @@ Size ImplDockingWindowWrapper::GetSizePixel() const return mpDockingWindow->GetSizePixel(); } - // old inlines from DockingWindow - void ImplDockingWindowWrapper::SetMinOutputSizePixel( const Size& rSize ) { if ( mpFloatWin ) @@ -1400,7 +1389,6 @@ bool ImplDockingWindowWrapper::IsFloatingMode() const return (mpFloatWin != NULL); } - void ImplDockingWindowWrapper::SetDragArea( const Rectangle& rRect ) { maDragArea = rRect; diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 36887e816f39..b8bc4988fd23 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/time.hxx> #include <tools/rc.h> #include <vcl/event.hxx> @@ -33,7 +32,6 @@ #include <brdwin.hxx> #include <salframe.hxx> - #define DOCKWIN_FLOATSTYLES (WB_SIZEABLE | WB_MOVEABLE | WB_CLOSEABLE | WB_STANDALONE | WB_PINABLE | WB_ROLLABLE ) class DockingWindow::ImplData @@ -86,7 +84,6 @@ public: sal_uLong GetLastTicks() const { return mnLastTicks; } }; - ImplDockFloatWin::ImplDockFloatWin( Window* pParent, WinBits nWinBits, DockingWindow* pDockingWin ) : FloatingWindow( pParent, nWinBits ), @@ -184,7 +181,6 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockingHdl) return 0; } - void ImplDockFloatWin::Move() { if( mbInMove ) diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 41e9bcdc022a..56bd19a08963 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svdata.hxx> #include <brdwin.hxx> #include <window.h> @@ -33,7 +32,6 @@ #include <tools/rc.h> #include <tools/debug.hxx> - class FloatingWindow::ImplData { public: @@ -248,7 +246,6 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow, aScreenRect = Application::GetScreenPosSizePixel( Application::GetBestScreen( bRTL ? devRectRTL : devRect ) ); - sal_uInt16 nArrangeAry[5]; sal_uInt16 nArrangeIndex; bool bBreak; @@ -747,7 +744,6 @@ void FloatingWindow::ImplEndPopupMode( sal_uInt16 nFlags, sal_uLong nFocusId ) while ( pSVData->maWinData.mpFirstFloat && pSVData->maWinData.mpFirstFloat != this ) pSVData->maWinData.mpFirstFloat->EndPopupMode( FLOATWIN_POPUPMODEEND_CANCEL ); - // delete window from the list pSVData->maWinData.mpFirstFloat = mpNextFloat; mpNextFloat = NULL; diff --git a/vcl/source/window/introwin.cxx b/vcl/source/window/introwin.cxx index f49f8601a21d..fa311d3129b5 100644 --- a/vcl/source/window/introwin.cxx +++ b/vcl/source/window/introwin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/wrkwin.hxx> #include <vcl/bitmap.hxx> #include <vcl/introwin.hxx> @@ -26,18 +25,12 @@ #include <svdata.hxx> #include <salframe.hxx> - - - - void IntroWindow::ImplInitIntroWindowData() { ImplSVData* pSVData = ImplGetSVData(); pSVData->mpIntroWindow = this; } - - IntroWindow::IntroWindow( ) : WorkWindow( WINDOW_INTROWINDOW ) { @@ -45,8 +38,6 @@ IntroWindow::IntroWindow( ) : WorkWindow::ImplInit( 0, WB_INTROWIN, NULL ); } - - IntroWindow::~IntroWindow() { ImplSVData* pSVData = ImplGetSVData(); diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx index a31ba0a2b61d..78f9b863ca10 100644 --- a/vcl/source/window/keycod.cxx +++ b/vcl/source/window/keycod.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <salinst.hxx> #include <salframe.hxx> #include <svdata.hxx> @@ -27,8 +26,6 @@ #include <tools/rc.h> - - static const sal_uInt16 aImplKeyFuncTab[(KEYFUNC_FRONT+1)*4] = { 0, 0, 0, 0, // KEYFUNC_DONTKNOW @@ -52,8 +49,6 @@ static const sal_uInt16 aImplKeyFuncTab[(KEYFUNC_FRONT+1)*4] = 0, 0, 0, 0 // KEYFUNC_FRONT }; - - void ImplGetKeyCode( KeyFuncType eFunc, sal_uInt16& rCode1, sal_uInt16& rCode2, sal_uInt16& rCode3, sal_uInt16& rCode4 ) { sal_uInt16 nIndex = (sal_uInt16)eFunc; @@ -64,8 +59,6 @@ void ImplGetKeyCode( KeyFuncType eFunc, sal_uInt16& rCode1, sal_uInt16& rCode2, rCode4 = aImplKeyFuncTab[nIndex+3]; } - - KeyCode::KeyCode( KeyFuncType eFunction ) { sal_uInt16 nDummy; @@ -73,8 +66,6 @@ KeyCode::KeyCode( KeyFuncType eFunction ) eFunc = eFunction; } - - KeyCode::KeyCode( const ResId& rResId ) : nCode(0) , eFunc(KEYFUNC_DONTKNOW) @@ -101,8 +92,6 @@ KeyCode::KeyCode( const ResId& rResId ) } } - - OUString KeyCode::GetName( Window* pWindow ) const { if ( !pWindow ) @@ -110,8 +99,6 @@ OUString KeyCode::GetName( Window* pWindow ) const return pWindow ? pWindow->ImplGetFrame()->GetKeyName( GetFullCode() ) : ""; } - - KeyFuncType KeyCode::GetFunction() const { if ( eFunc != KEYFUNC_DONTKNOW ) diff --git a/vcl/source/window/keyevent.cxx b/vcl/source/window/keyevent.cxx index bc84e210c550..c133d1d37d95 100644 --- a/vcl/source/window/keyevent.cxx +++ b/vcl/source/window/keyevent.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/awt/KeyEvent.hpp> #include <com/sun/star/awt/KeyModifier.hpp> #include <tools/debug.hxx> @@ -64,9 +63,6 @@ KeyEvent KeyEvent::LogicalTextDirectionality (TextDirectionality eMode) const return aClone; } - - - const Point& HelpEvent::GetMousePosPixel() const { //DBG_ASSERT( !mbKeyboardActivated, "Keyboard help has no mouse position !"); diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 4c8a77694635..5ae34120ad43 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -2047,7 +2047,6 @@ void MessageDialog::SetMessagesWidths(Window *pParent, pPrimaryMessage->SetMaxTextWidth(pPrimaryMessage->approximate_char_width() * 60); } - short MessageDialog::Execute() { setDeferredProperties(); diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 6cd7e7c218bc..fb6f98203366 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tools/debug.hxx" #include "tools/diagnose_ex.h" #include "tools/rc.h" @@ -50,7 +49,6 @@ #include "salmenu.hxx" #include "salframe.hxx" - #include <com/sun/star/uno/Reference.h> #include <com/sun/star/i18n/XCharacterClassification.hpp> #include <com/sun/star/lang/XComponent.hpp> @@ -81,7 +79,6 @@ struct MenuLayoutData : public ControlLayoutData using namespace ::com::sun::star; using namespace vcl; - #define ITEMPOS_INVALID 0xFFFF #define EXTRASPACEY 2 @@ -213,7 +210,6 @@ public: void InsertSeparator(const OString &rIdent, size_t nPos); void Remove( size_t nPos ); - MenuItemData* GetData( sal_uInt16 nSVId, size_t& rPos ) const; MenuItemData* GetData( sal_uInt16 nSVId ) const { @@ -240,8 +236,6 @@ public: } }; - - MenuItemList::~MenuItemList() { for( size_t i = 0, n = maItemList.size(); i < n; ++i ) @@ -477,11 +471,8 @@ size_t MenuItemList::GetItemCount( KeyCode aKeyCode ) const return nItems; } - - // - MenuFloatingWindow - - class MenuFloatingWindow : public FloatingWindow { friend void Menu::ImplFillLayoutData() const; @@ -671,13 +662,11 @@ void DecoToolBox::SetImages( long nMaxHeight, bool bForce ) (lastSize - maImage.GetSizePixel().Height())/2 ), maImage.GetSizePixel() ); - aBmpExDst.CopyPixel( aDestRect, aSrcRect, &aBmpExSrc ); SetItemImage( IID_DOCUMENTCLOSE, Image( aBmpExDst ) ); } } - // a basic class for both (due to pActivePopup, Timer,...) would be nice, // but a container class should have been created then, as they // would be derived from different windows @@ -1555,7 +1544,6 @@ sal_uInt16 Menu::GetItemId(const OString &rIdent) const return MENU_ITEM_NOTFOUND; } - sal_uInt16 Menu::GetItemPos( sal_uInt16 nItemId ) const { size_t nPos; @@ -2336,8 +2324,6 @@ bool Menu::ImplGetNativeSubmenuArrowSize( Window* pWin, Size& rArrowSize, long& return false; } - - void Menu::ImplAddDel( ImplMenuDelData& rDel ) { DBG_ASSERT( !rDel.mpMenu, "Menu::ImplAddDel(): cannot add ImplMenuDelData twice !" ); @@ -2349,8 +2335,6 @@ void Menu::ImplAddDel( ImplMenuDelData& rDel ) } } - - void Menu::ImplRemoveDel( ImplMenuDelData& rDel ) { rDel.mpMenu = NULL; @@ -2370,8 +2354,6 @@ void Menu::ImplRemoveDel( ImplMenuDelData& rDel ) } } - - Size Menu::ImplCalcSize( const Window* pWin ) { // | Check/Radio/Image| Text| Accel/Popup| @@ -3137,7 +3119,6 @@ Rectangle Menu::GetCharacterBounds( sal_uInt16 nItemID, long nIndex ) const return (mpLayoutData && nItemIndex != -1) ? mpLayoutData->GetCharacterBounds( nItemIndex+nIndex ) : Rectangle(); } - long Menu::GetIndexForPoint( const Point& rPoint, sal_uInt16& rItemID ) const { long nIndex = -1; @@ -3250,11 +3231,8 @@ void Menu::HighlightItem( sal_uInt16 nItemPos ) } } - - // - MenuBar - - MenuBar::MenuBar() : Menu( true ) { mbDisplayable = true; @@ -3355,8 +3333,6 @@ bool MenuBar::ImplHandleKeyEvent( const KeyEvent& rKEvent, bool bFromMenu ) return bDone; } - - void MenuBar::SelectEntry( sal_uInt16 nId ) { MenuBarWindow* pMenuWin = (MenuBarWindow*) ImplGetWindow(); @@ -3378,8 +3354,6 @@ void MenuBar::SelectEntry( sal_uInt16 nId ) } } - - // handler for native menu selection and command events bool MenuBar::HandleMenuActivateEvent( Menu *pMenu ) const @@ -3479,8 +3453,6 @@ bool MenuBar::HandleMenuButtonEvent( Menu *, sal_uInt16 i_nButtonId ) const return static_cast<MenuBarWindow*>(pWindow)->HandleMenuButtonEvent( i_nButtonId ); } - - // bool PopupMenu::bAnyPopupInExecute = false; PopupMenu::PopupMenu() @@ -3662,7 +3634,6 @@ sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uLong // #102790# context menus shall never show disabled entries nMenuFlags |= MENU_FLAG_HIDEDISABLEDENTRIES; - sal_uInt16 nVisibleEntries = ImplGetVisibleItemCount(); if ( !nVisibleEntries ) { @@ -3895,7 +3866,6 @@ long PopupMenu::ImplCalcHeight( sal_uInt16 nEntries ) const return nHeight; } - static void ImplInitMenuWindow( Window* pWin, bool bFont, bool bMenuBar ) { const StyleSettings& rStyleSettings = pWin->GetSettings().GetStyleSettings(); @@ -4537,7 +4507,6 @@ void MenuFloatingWindow::ImplScroll( bool bUp ) nFirstEntry = pMenu->ImplGetNextVisible( nFirstEntry ); DBG_ASSERT( nFirstEntry != ITEMPOS_INVALID, "Scroll?!" ); - if ( !bScrollUp ) { bScrollUp = true; @@ -4791,7 +4760,6 @@ Rectangle MenuFloatingWindow::ImplGetItemRect( sal_uInt16 nPos ) return aRect; } - void MenuFloatingWindow::ImplCursorUpDown( bool bUp, bool bHomeEnd ) { if( ! pMenu ) @@ -5374,7 +5342,6 @@ void MenuBarWindow::ImplCreatePopup( bool bPreSelectFirst ) } } - void MenuBarWindow::KillActivePopup() { if ( pActivePopup ) diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx index e42cadaac73b..730e6a2af554 100644 --- a/vcl/source/window/mnemonic.cxx +++ b/vcl/source/window/mnemonic.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <string.h> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> @@ -29,16 +28,11 @@ using namespace ::com::sun::star; - - - MnemonicGenerator::MnemonicGenerator() { memset( maMnemonics, 1, sizeof( maMnemonics ) ); } - - sal_uInt16 MnemonicGenerator::ImplGetMnemonicIndex( sal_Unicode c ) { static sal_uInt16 const aImplMnemonicRangeTab[MNEMONIC_RANGES*2] = @@ -62,8 +56,6 @@ sal_uInt16 MnemonicGenerator::ImplGetMnemonicIndex( sal_Unicode c ) return MNEMONIC_INDEX_NOTFOUND; } - - sal_Unicode MnemonicGenerator::ImplFindMnemonic( const OUString& rKey ) { sal_Int32 nIndex = 0; @@ -78,8 +70,6 @@ sal_Unicode MnemonicGenerator::ImplFindMnemonic( const OUString& rKey ) return 0; } - - void MnemonicGenerator::RegisterMnemonic( const OUString& rKey ) { const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetUILanguageTag().getLocale(); @@ -121,8 +111,6 @@ void MnemonicGenerator::RegisterMnemonic( const OUString& rKey ) } } - - OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey ) { if ( _rKey.isEmpty() || ImplFindMnemonic( _rKey ) ) @@ -345,8 +333,6 @@ OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey ) return rKey; } - - uno::Reference< i18n::XCharacterClassification > MnemonicGenerator::GetCharClass() { if ( !mxCharClass.is() ) @@ -354,8 +340,6 @@ uno::Reference< i18n::XCharacterClassification > MnemonicGenerator::GetCharClass return mxCharClass; } - - OUString MnemonicGenerator::EraseAllMnemonicChars( const OUString& rStr ) { OUString aStr = rStr; diff --git a/vcl/source/window/mouseevent.cxx b/vcl/source/window/mouseevent.cxx index 2a8d25315cc4..b23b9c037b68 100644 --- a/vcl/source/window/mouseevent.cxx +++ b/vcl/source/window/mouseevent.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/awt/MouseEvent.hpp> #include <com/sun/star/awt/KeyModifier.hpp> #include <com/sun/star/awt/MouseButton.hpp> diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index 9efff517e601..7a3c597c40a0 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/rc.h> #include <svids.hrc> @@ -35,9 +34,6 @@ #include <vcl/mnemonic.hxx> #include <vcl/settings.hxx> - - - static void ImplInitMsgBoxImageList() { ImplSVData* pSVData = ImplGetSVData(); @@ -54,8 +50,6 @@ static void ImplInitMsgBoxImageList() } } - - void MessBox::ImplInitMessBoxData() { mpVCLMultiLineEdit = NULL; @@ -65,8 +59,6 @@ void MessBox::ImplInitMessBoxData() mbCheck = false; } - - void MessBox::ImplInitButtons() { WinBits nStyle = GetStyle(); @@ -144,8 +136,6 @@ void MessBox::ImplInitButtons() } } - - MessBox::MessBox( Window* pParent, WinBits nStyle, const OUString& rTitle, const OUString& rMessage ) : ButtonDialog( WINDOW_MESSBOX ), @@ -159,8 +149,6 @@ MessBox::MessBox( Window* pParent, WinBits nStyle, SetText( rTitle ); } - - MessBox::MessBox( Window* pParent, const ResId& rResId ) : ButtonDialog( WINDOW_MESSBOX ) { @@ -182,8 +170,6 @@ MessBox::MessBox( Window* pParent, const ResId& rResId ) : ImplInitButtons(); } - - void MessBox::ImplLoadRes( const ResId& ) { SetText( ReadStringRes() ); @@ -191,8 +177,6 @@ void MessBox::ImplLoadRes( const ResId& ) SetHelpText( ReadStringRes() ); } - - MessBox::~MessBox() { delete mpVCLMultiLineEdit; @@ -200,8 +184,6 @@ MessBox::~MessBox() delete mpCheckBox; } - - void MessBox::ImplPosControls() { if ( !GetHelpId().isEmpty() ) @@ -397,8 +379,6 @@ void MessBox::ImplPosControls() SetPageSizePixel( aPageSize ); } - - void MessBox::StateChanged( StateChangedType nType ) { if ( nType == STATE_CHANGE_INITSHOW ) @@ -408,31 +388,23 @@ void MessBox::StateChanged( StateChangedType nType ) ButtonDialog::StateChanged( nType ); } - - bool MessBox::GetCheckBoxState() const { return mpCheckBox ? mpCheckBox->IsChecked() : mbCheck; } - - void MessBox::SetCheckBoxState( bool bCheck ) { if( mpCheckBox ) mpCheckBox->Check( bCheck ); mbCheck = bCheck; } - - Size MessBox::GetOptimalSize() const { // FIXME: base me on the font size ? return Size( 250, 100 ); } - - void InfoBox::ImplInitInfoBoxData() { // Default Text is the display title from the application @@ -442,40 +414,30 @@ void InfoBox::ImplInitInfoBoxData() SetImage( InfoBox::GetStandardImage() ); } - - InfoBox::InfoBox( Window* pParent, const OUString& rMessage ) : MessBox( pParent, WB_OK | WB_DEF_OK, OUString(), rMessage ) { ImplInitInfoBoxData(); } - - InfoBox::InfoBox( Window* pParent, const ResId & rResId ) : MessBox( pParent, rResId.SetRT( RSC_INFOBOX ) ) { ImplInitInfoBoxData(); } - - InfoBox::InfoBox( Window* pParent, WinBits nStyle, const OUString& rMessage ) : MessBox( pParent, nStyle, OUString(), rMessage ) { ImplInitInfoBoxData(); } - - Image InfoBox::GetStandardImage() { ImplInitMsgBoxImageList(); return ImplGetSVData()->maWinData.mpMsgBoxImgList->GetImage( 4 ); } - - void WarningBox::ImplInitWarningBoxData() { // Default Text is the display title from the application @@ -485,8 +447,6 @@ void WarningBox::ImplInitWarningBoxData() SetImage( WarningBox::GetStandardImage() ); } - - WarningBox::WarningBox( Window* pParent, WinBits nStyle, const OUString& rMessage ) : MessBox( pParent, nStyle, OUString(), rMessage ) @@ -494,16 +454,12 @@ WarningBox::WarningBox( Window* pParent, WinBits nStyle, ImplInitWarningBoxData(); } - - WarningBox::WarningBox( Window* pParent, const ResId& rResId ) : MessBox( pParent, rResId.SetRT( RSC_WARNINGBOX ) ) { ImplInitWarningBoxData(); } - - void WarningBox::SetDefaultCheckBoxText() { ResMgr* pResMgr = ImplGetResMgr(); @@ -511,16 +467,12 @@ void WarningBox::SetDefaultCheckBoxText() maCheckBoxText = ResId(SV_STDTEXT_DONTWARNAGAIN, *pResMgr).toString(); } - - Image WarningBox::GetStandardImage() { ImplInitMsgBoxImageList(); return ImplGetSVData()->maWinData.mpMsgBoxImgList->GetImage( 3 ); } - - void ErrorBox::ImplInitErrorBoxData() { // Default Text is the display title from the application @@ -530,8 +482,6 @@ void ErrorBox::ImplInitErrorBoxData() SetImage( ErrorBox::GetStandardImage() ); } - - ErrorBox::ErrorBox( Window* pParent, WinBits nStyle, const OUString& rMessage ) : MessBox( pParent, nStyle, OUString(), rMessage ) @@ -539,16 +489,12 @@ ErrorBox::ErrorBox( Window* pParent, WinBits nStyle, ImplInitErrorBoxData(); } - - ErrorBox::ErrorBox( Window* pParent, const ResId& rResId ) : MessBox( pParent, rResId.SetRT( RSC_ERRORBOX ) ) { ImplInitErrorBoxData(); } - - Image ErrorBox::GetStandardImage() { try @@ -564,8 +510,6 @@ Image ErrorBox::GetStandardImage() return ImplGetSVData()->maWinData.mpMsgBoxImgList->GetImage( 1 ); } - - void QueryBox::ImplInitQueryBoxData() { // Default Text is the display title from the application @@ -575,24 +519,18 @@ void QueryBox::ImplInitQueryBoxData() SetImage( QueryBox::GetStandardImage() ); } - - QueryBox::QueryBox( Window* pParent, WinBits nStyle, const OUString& rMessage ) : MessBox( pParent, nStyle, OUString(), rMessage ) { ImplInitQueryBoxData(); } - - QueryBox::QueryBox( Window* pParent, const ResId& rResId ) : MessBox( pParent, rResId.SetRT( RSC_QUERYBOX ) ) { ImplInitQueryBoxData(); } - - void QueryBox::SetDefaultCheckBoxText() { ResMgr* pResMgr = ImplGetResMgr(); @@ -600,8 +538,6 @@ void QueryBox::SetDefaultCheckBoxText() maCheckBoxText = ResId(SV_STDTEXT_DONTASKAGAIN, *pResMgr).toString(); } - - Image QueryBox::GetStandardImage() { ImplInitMsgBoxImageList(); diff --git a/vcl/source/window/popupmenuwindow.cxx b/vcl/source/window/popupmenuwindow.cxx index 2cf4c059a15c..9ce03cea4f0b 100644 --- a/vcl/source/window/popupmenuwindow.cxx +++ b/vcl/source/window/popupmenuwindow.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/popupmenuwindow.hxx" #include <limits> @@ -39,8 +38,6 @@ PopupMenuFloatingWindow::ImplData::~ImplData() { } - - PopupMenuFloatingWindow::PopupMenuFloatingWindow( Window* pParent, WinBits nStyle ) : FloatingWindow(pParent, nStyle), mpImplData(new ImplData) diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 7f7cbd8468ea..e7a4284b12b7 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -267,7 +267,6 @@ void PrintDialog::PrintPreviewWindow::preparePreviewBitmap() aOrigSize.Height() = aLogicSize.Height(); double fScale = double(aLogicSize.Width())/double(aOrigSize.Width()); - maPageVDev.Erase(); maPageVDev.Push(); maPageVDev.SetMapMode( MAP_100TH_MM ); @@ -1249,7 +1248,6 @@ void PrintDialog::checkOptionalControlDependencies() } } - bool bIsEnabled = it->first->IsEnabled(); // Enable does not do a change check first, so can be less cheap than expected if( bShouldbeEnabled != bIsEnabled ) @@ -1861,12 +1859,8 @@ void PrintDialog::previewBackward() mpPageEdit->Down(); } - - // PrintProgressDialog - - PrintProgressDialog::PrintProgressDialog(Window* i_pParent, int i_nMax) : ModelessDialog(i_pParent, "PrintProgressDialog", "vcl/ui/printprogressdialog.ui") diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index 6796d0a6711a..6a44ee41777b 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <limits.h> #include <tools/time.hxx> #include <tools/debug.hxx> diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx index fc5e257a247b..c1fcbe938ce9 100644 --- a/vcl/source/window/seleng.cxx +++ b/vcl/source/window/seleng.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/window.hxx> #include <vcl/seleng.hxx> #include <tools/debug.hxx> @@ -26,16 +25,13 @@ FunctionSet::~FunctionSet() { } - inline bool SelectionEngine::ShouldDeselect( bool bModifierKey1 ) const { return eSelMode != MULTIPLE_SELECTION || !bModifierKey1; } - // TODO: throw out FunctionSet::SelectAtPoint - SelectionEngine::SelectionEngine( Window* pWindow, FunctionSet* pFuncSet, sal_uLong nAutoRepeatInterval ) : pWin( pWindow ), @@ -50,13 +46,11 @@ SelectionEngine::SelectionEngine( Window* pWindow, FunctionSet* pFuncSet, aWTimer.SetTimeout( nUpdateInterval ); } - SelectionEngine::~SelectionEngine() { aWTimer.Stop(); } - IMPL_LINK_NOARG(SelectionEngine, ImpWatchDog) { if ( !aArea.IsInside( aLastMove.GetPosPixel() ) ) @@ -64,13 +58,11 @@ IMPL_LINK_NOARG(SelectionEngine, ImpWatchDog) return 0; } - void SelectionEngine::SetSelectionMode( SelectionMode eMode ) { eSelMode = eMode; } - void SelectionEngine::CursorPosChanging( bool bShift, bool bMod1 ) { if ( !pFunctionSet ) @@ -119,7 +111,6 @@ void SelectionEngine::CursorPosChanging( bool bShift, bool bMod1 ) } } - bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) { nFlags &= (~SELENG_CMDEVT); @@ -242,7 +233,6 @@ bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) return false; } - bool SelectionEngine::SelMouseButtonUp( const MouseEvent& rMEvt ) { aWTimer.Stop(); @@ -286,7 +276,6 @@ bool SelectionEngine::SelMouseButtonUp( const MouseEvent& rMEvt ) return true; } - bool SelectionEngine::SelMouseMove( const MouseEvent& rMEvt ) { @@ -319,7 +308,6 @@ bool SelectionEngine::SelMouseMove( const MouseEvent& rMEvt ) return true; } - void SelectionEngine::SetWindow( Window* pNewWin ) { if( pNewWin != pWin ) @@ -332,7 +320,6 @@ void SelectionEngine::SetWindow( Window* pNewWin ) } } - void SelectionEngine::Reset() { aWTimer.Stop(); @@ -342,7 +329,6 @@ void SelectionEngine::Reset() nLockedMods = 0; } - void SelectionEngine::Command( const CommandEvent& rCEvt ) { // Timer aWTimer is active during enlarging a selection diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx index 05d7d4b62c03..1fa4e6ee37e1 100644 --- a/vcl/source/window/split.cxx +++ b/vcl/source/window/split.cxx @@ -49,8 +49,6 @@ namespace }; } - - void Splitter::ImplInitSplitterData() { ImplGetWindowImpl()->mbSplitter = true; @@ -64,8 +62,6 @@ void Splitter::ImplInitSplitterData() mnKeyboardStepSize = SPLITTER_DEFAULTSTEPSIZE; } - - // Should only be called from a ImplInit method for initialization or // after checking bNew is different from the current mbHorzSplit value. // The public method that does that check is Splitter::SetHorizontal(). @@ -90,8 +86,6 @@ void Splitter::ImplInitHorVer(bool bNew) SetPointer( Pointer( ePointerStyle ) ); } - - void Splitter::ImplInit( Window* pParent, WinBits nWinStyle ) { Window::ImplInit( pParent, nWinStyle, NULL ); @@ -109,8 +103,6 @@ void Splitter::ImplInit( Window* pParent, WinBits nWinStyle ) pTList->AddWindow( this ); } - - void Splitter::ImplSplitMousePos( Point& rPos ) { if ( mbHorzSplit ) @@ -129,8 +121,6 @@ void Splitter::ImplSplitMousePos( Point& rPos ) } } - - void Splitter::ImplDrawSplitter() { Rectangle aInvRect( maDragRect ); @@ -149,8 +139,6 @@ void Splitter::ImplDrawSplitter() mpRefWin->InvertTracking( mpRefWin->PixelToLogic(aInvRect), SHOWTRACK_SPLIT ); } - - Splitter::Splitter( Window* pParent, WinBits nStyle ) : Window( WINDOW_SPLITTER ) { @@ -161,8 +149,6 @@ Splitter::Splitter( Window* pParent, WinBits nStyle ) : SetFillColor(); } - - Splitter::Splitter( Window* pParent, const ResId& rResId ) : Window( WINDOW_SPLITTER ) { @@ -179,16 +165,12 @@ Splitter::Splitter( Window* pParent, const ResId& rResId ) : Show(); } - - Splitter::~Splitter() { TaskPaneList *pTList = GetSystemWindow()->GetTaskPaneList(); pTList->RemoveWindow( this ); } - - void Splitter::SetHorizontal(bool bNew) { if(bNew != (bool)mbHorzSplit) @@ -197,15 +179,11 @@ void Splitter::SetHorizontal(bool bNew) } } - - void Splitter::SetKeyboardStepSize( long nStepSize ) { mnKeyboardStepSize = nStepSize; } - - Splitter* Splitter::ImplFindSibling() { // look for another splitter with the same parent but different orientation @@ -224,8 +202,6 @@ Splitter* Splitter::ImplFindSibling() return NULL; } - - bool Splitter::ImplSplitterActive() { // is splitter in document or at scrollbar handle ? @@ -249,8 +225,6 @@ bool Splitter::ImplSplitterActive() return bActive; } - - void Splitter::MouseButtonDown( const MouseEvent& rMEvt ) { if ( rMEvt.GetClicks() == 2 ) @@ -280,8 +254,6 @@ void Splitter::MouseButtonDown( const MouseEvent& rMEvt ) StartDrag(); } - - void Splitter::Tracking( const TrackingEvent& rTEvt ) { if ( rTEvt.IsTrackingEnded() ) @@ -356,8 +328,6 @@ void Splitter::Tracking( const TrackingEvent& rTEvt ) } } - - void Splitter::ImplKbdTracking( KeyCode aKeyCode ) { sal_uInt16 nCode = aKeyCode.GetCode(); @@ -473,36 +443,26 @@ void Splitter::ImplKbdTracking( KeyCode aKeyCode ) } } - - void Splitter::StartSplit() { maStartSplitHdl.Call( this ); } - - void Splitter::Split() { maSplitHdl.Call( this ); } - - void Splitter::EndSplit() { if ( maEndSplitHdl.IsSet() ) maEndSplitHdl.Call( this ); } - - void Splitter::Splitting( Point& /* rSplitPos */ ) { } - - void Splitter::SetDragRectPixel( const Rectangle& rDragRect, Window* _pRefWin ) { maDragRect = rDragRect; @@ -512,15 +472,11 @@ void Splitter::SetDragRectPixel( const Rectangle& rDragRect, Window* _pRefWin ) mpRefWin = _pRefWin; } - - void Splitter::SetSplitPosPixel( long nNewPos ) { mnSplitPos = nNewPos; } - - void Splitter::StartDrag() { if ( IsTracking() ) @@ -546,9 +502,6 @@ void Splitter::StartDrag() ImplDrawSplitter(); } - - - void Splitter::ImplStartKbdSplitting() { if( mbKbdSplitting ) @@ -577,8 +530,6 @@ void Splitter::ImplStartKbdSplitting() mnStartSplitPos = maDragPos.Y(); } - - void Splitter::ImplRestoreSplitter() { // set splitter in the center of the ref window @@ -607,9 +558,6 @@ void Splitter::ImplRestoreSplitter() EndSplit(); } - - - void Splitter::GetFocus() { if( !ImplSplitterActive() ) @@ -618,8 +566,6 @@ void Splitter::GetFocus() Invalidate(); } - - void Splitter::LoseFocus() { if( mbKbdSplitting ) @@ -631,8 +577,6 @@ void Splitter::LoseFocus() Invalidate(); } - - void Splitter::KeyInput( const KeyEvent& rKEvt ) { if( mbInKeyEvent ) @@ -732,15 +676,11 @@ void Splitter::KeyInput( const KeyEvent& rKEvt ) mbInKeyEvent = 0; } - - bool Splitter::Notify( NotifyEvent& rNEvt ) { return Window::Notify( rNEvt ); } - - void Splitter::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); @@ -762,8 +702,6 @@ void Splitter::DataChanged( const DataChangedEvent& rDCEvt ) } } - - void Splitter::Paint( const Rectangle& rPaintRect ) { DrawRect( rPaintRect ); diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index cabfb25ac7a0..b2882202aff9 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <string.h> #include <tools/debug.hxx> diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index e492500e0c2b..0b8502e3af08 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/debug.hxx> #include <tools/rc.h> @@ -32,8 +31,6 @@ #include <svdata.hxx> #include <window.h> - - #define STATUSBAR_OFFSET_X STATUSBAR_OFFSET #define STATUSBAR_OFFSET_Y 2 #define STATUSBAR_OFFSET_TEXTY 3 @@ -42,8 +39,6 @@ #define STATUSBAR_PRGS_COUNT 100 #define STATUSBAR_PRGS_MIN 5 - - class StatusBar::ImplData { public: @@ -84,15 +79,11 @@ struct ImplStatusItem OUString maCommand; }; - - inline long ImplCalcProgessWidth( sal_uInt16 nMax, long nSize ) { return ((nMax*(nSize+(nSize/2)))-(nSize/2)+(STATUSBAR_PRGS_OFFSET*2)); } - - static Point ImplGetItemTextPos( const Size& rRectSize, const Size& rTextSize, sal_uInt16 nStyle ) { @@ -112,8 +103,6 @@ static Point ImplGetItemTextPos( const Size& rRectSize, const Size& rTextSize, return Point( nX, nY ); } - - bool StatusBar::ImplIsItemUpdate() { if ( !mbProgressMode && mbVisibleItems && IsReallyVisible() && IsUpdateMode() ) @@ -122,8 +111,6 @@ bool StatusBar::ImplIsItemUpdate() return false; } - - void StatusBar::ImplInit( Window* pParent, WinBits nStyle ) { mpImplData = new ImplData; @@ -155,16 +142,12 @@ void StatusBar::ImplInit( Window* pParent, WinBits nStyle ) SetOutputSizePixel( CalcWindowSizePixel() ); } - - StatusBar::StatusBar( Window* pParent, WinBits nStyle ) : Window( WINDOW_STATUSBAR ) { ImplInit( pParent, nStyle ); } - - StatusBar::~StatusBar() { // delete all items @@ -178,8 +161,6 @@ StatusBar::~StatusBar() delete mpImplData; } - - void StatusBar::ImplInitSettings( bool bFont, bool bForeground, bool bBackground ) { @@ -233,8 +214,6 @@ void StatusBar::ImplInitSettings( bool bFont, } } - - void StatusBar::ImplFormat() { ImplStatusItem* pItem; @@ -309,8 +288,6 @@ void StatusBar::ImplFormat() mbFormat = false; } - - Rectangle StatusBar::ImplGetItemRectPos( sal_uInt16 nPos ) const { Rectangle aRect; @@ -330,8 +307,6 @@ Rectangle StatusBar::ImplGetItemRectPos( sal_uInt16 nPos ) const return aRect; } - - sal_uInt16 StatusBar::ImplGetFirstVisiblePos() const { ImplStatusItem* pItem; @@ -349,8 +324,6 @@ sal_uInt16 StatusBar::ImplGetFirstVisiblePos() const return ~0; } - - void StatusBar::ImplDrawText( bool bOffScreen, long nOldTextWidth ) { // prevent item box from being overwritten @@ -386,8 +359,6 @@ void StatusBar::ImplDrawText( bool bOffScreen, long nOldTextWidth ) } } - - void StatusBar::ImplDrawItem( bool bOffScreen, sal_uInt16 nPos, bool bDrawText, bool bDrawFrame ) { Rectangle aRect = ImplGetItemRectPos( nPos ); @@ -487,8 +458,6 @@ void StatusBar::ImplDrawItem( bool bOffScreen, sal_uInt16 nPos, bool bDrawText, ImplCallEventListeners( VCLEVENT_STATUSBAR_DRAWITEM, (void*) sal_IntPtr(pItem->mnId) ); } - - void DrawProgress( Window* pWindow, const Point& rPos, long nOffset, long nPrgsWidth, long nPrgsHeight, sal_uInt16 nPercent1, sal_uInt16 nPercent2, sal_uInt16 nPercentCount, @@ -605,8 +574,6 @@ void DrawProgress( Window* pWindow, const Point& rPos, } } - - void StatusBar::ImplDrawProgress( bool bPaint, sal_uInt16 nPercent1, sal_uInt16 nPercent2 ) { @@ -634,8 +601,6 @@ void StatusBar::ImplDrawProgress( bool bPaint, nPercent1*100, nPercent2*100, mnPercentCount, maPrgsFrameRect ); } - - void StatusBar::ImplCalcProgressRect() { // calculate text size @@ -688,8 +653,6 @@ void StatusBar::ImplCalcProgressRect() maPrgsTxtPos.Y() = mnTextY; } - - void StatusBar::MouseButtonDown( const MouseEvent& rMEvt ) { // trigger toolbox only for left mouse button @@ -727,8 +690,6 @@ void StatusBar::MouseButtonDown( const MouseEvent& rMEvt ) } } - - void StatusBar::Paint( const Rectangle& ) { if ( mbFormat ) @@ -759,15 +720,11 @@ void StatusBar::Paint( const Rectangle& ) DrawLine( Point( 0, 0 ), Point( mnDX-1, 0 ) ); } - - void StatusBar::Move() { Window::Move(); } - - void StatusBar::Resize() { // save width and height @@ -788,8 +745,6 @@ void StatusBar::Resize() Invalidate(); } - - void StatusBar::RequestHelp( const HelpEvent& rHEvt ) { // no keyboard help in status bar @@ -855,8 +810,6 @@ void StatusBar::RequestHelp( const HelpEvent& rHEvt ) Window::RequestHelp( rHEvt ); } - - void StatusBar::StateChanged( StateChangedType nType ) { Window::StateChanged( nType ); @@ -884,8 +837,6 @@ void StatusBar::StateChanged( StateChangedType nType ) } } - - void StatusBar::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); @@ -917,30 +868,22 @@ void StatusBar::DataChanged( const DataChangedEvent& rDCEvt ) } } - - void StatusBar::Click() { ImplCallEventListeners( VCLEVENT_STATUSBAR_CLICK ); maClickHdl.Call( this ); } - - void StatusBar::DoubleClick() { ImplCallEventListeners( VCLEVENT_STATUSBAR_DOUBLECLICK ); maDoubleClickHdl.Call( this ); } - - void StatusBar::UserDraw( const UserDrawEvent& ) { } - - void StatusBar::InsertItem( sal_uInt16 nItemId, sal_uLong nWidth, StatusBarItemBits nBits, long nOffset, sal_uInt16 nPos ) @@ -979,8 +922,6 @@ void StatusBar::InsertItem( sal_uInt16 nItemId, sal_uLong nWidth, ImplCallEventListeners( VCLEVENT_STATUSBAR_ITEMADDED, (void*) sal_IntPtr(nItemId) ); } - - void StatusBar::RemoveItem( sal_uInt16 nItemId ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -997,8 +938,6 @@ void StatusBar::RemoveItem( sal_uInt16 nItemId ) } } - - void StatusBar::ShowItem( sal_uInt16 nItemId ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1019,8 +958,6 @@ void StatusBar::ShowItem( sal_uInt16 nItemId ) } } - - void StatusBar::HideItem( sal_uInt16 nItemId ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1041,8 +978,6 @@ void StatusBar::HideItem( sal_uInt16 nItemId ) } } - - bool StatusBar::IsItemVisible( sal_uInt16 nItemId ) const { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1068,15 +1003,11 @@ void StatusBar::Clear() ImplCallEventListeners( VCLEVENT_STATUSBAR_ALLITEMSREMOVED ); } - - sal_uInt16 StatusBar::GetItemCount() const { return (sal_uInt16)mpItemList->size(); } - - sal_uInt16 StatusBar::GetItemId( sal_uInt16 nPos ) const { if ( nPos < mpItemList->size() ) @@ -1084,8 +1015,6 @@ sal_uInt16 StatusBar::GetItemId( sal_uInt16 nPos ) const return 0; } - - sal_uInt16 StatusBar::GetItemPos( sal_uInt16 nItemId ) const { for ( size_t i = 0, n = mpItemList->size(); i < n; ++i ) { @@ -1097,8 +1026,6 @@ sal_uInt16 StatusBar::GetItemPos( sal_uInt16 nItemId ) const return STATUSBAR_ITEM_NOTFOUND; } - - sal_uInt16 StatusBar::GetItemId( const Point& rPos ) const { if ( AreItemsVisible() && !mbFormat ) @@ -1117,8 +1044,6 @@ sal_uInt16 StatusBar::GetItemId( const Point& rPos ) const return 0; } - - Rectangle StatusBar::GetItemRect( sal_uInt16 nItemId ) const { Rectangle aRect; @@ -1142,8 +1067,6 @@ Rectangle StatusBar::GetItemRect( sal_uInt16 nItemId ) const return aRect; } - - Point StatusBar::GetItemTextPos( sal_uInt16 nItemId ) const { if ( !mbFormat ) @@ -1172,8 +1095,6 @@ Point StatusBar::GetItemTextPos( sal_uInt16 nItemId ) const return Point(); } - - sal_uLong StatusBar::GetItemWidth( sal_uInt16 nItemId ) const { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1184,8 +1105,6 @@ sal_uLong StatusBar::GetItemWidth( sal_uInt16 nItemId ) const return 0; } - - StatusBarItemBits StatusBar::GetItemBits( sal_uInt16 nItemId ) const { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1196,8 +1115,6 @@ StatusBarItemBits StatusBar::GetItemBits( sal_uInt16 nItemId ) const return 0; } - - long StatusBar::GetItemOffset( sal_uInt16 nItemId ) const { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1208,8 +1125,6 @@ long StatusBar::GetItemOffset( sal_uInt16 nItemId ) const return 0; } - - void StatusBar::SetItemText( sal_uInt16 nItemId, const OUString& rText ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1244,8 +1159,6 @@ void StatusBar::SetItemText( sal_uInt16 nItemId, const OUString& rText ) } } - - const OUString& StatusBar::GetItemText( sal_uInt16 nItemId ) const { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1255,8 +1168,6 @@ const OUString& StatusBar::GetItemText( sal_uInt16 nItemId ) const return (*mpItemList)[ nPos ]->maText; } - - void StatusBar::SetItemCommand( sal_uInt16 nItemId, const OUString& rCommand ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1270,8 +1181,6 @@ void StatusBar::SetItemCommand( sal_uInt16 nItemId, const OUString& rCommand ) } } - - const OUString StatusBar::GetItemCommand( sal_uInt16 nItemId ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1282,8 +1191,6 @@ const OUString StatusBar::GetItemCommand( sal_uInt16 nItemId ) return OUString(); } - - void StatusBar::SetItemData( sal_uInt16 nItemId, void* pNewData ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1333,8 +1240,6 @@ void StatusBar::RedrawItem( sal_uInt16 nItemId ) } } - - void StatusBar::SetHelpText( sal_uInt16 nItemId, const OUString& rText ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1343,8 +1248,6 @@ void StatusBar::SetHelpText( sal_uInt16 nItemId, const OUString& rText ) (*mpItemList)[ nPos ]->maHelpText = rText; } - - const OUString& StatusBar::GetHelpText( sal_uInt16 nItemId ) const { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1367,8 +1270,6 @@ const OUString& StatusBar::GetHelpText( sal_uInt16 nItemId ) const return pItem->maHelpText; } - - void StatusBar::SetQuickHelpText( sal_uInt16 nItemId, const OUString& rText ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1377,8 +1278,6 @@ void StatusBar::SetQuickHelpText( sal_uInt16 nItemId, const OUString& rText ) (*mpItemList)[ nPos ]->maQuickHelpText = rText; } - - const OUString& StatusBar::GetQuickHelpText( sal_uInt16 nItemId ) const { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1389,8 +1288,6 @@ const OUString& StatusBar::GetQuickHelpText( sal_uInt16 nItemId ) const return pItem->maQuickHelpText; } - - void StatusBar::SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1399,8 +1296,6 @@ void StatusBar::SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ) (*mpItemList)[ nPos ]->maHelpId = rHelpId; } - - OString StatusBar::GetHelpId( sal_uInt16 nItemId ) const { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1444,8 +1339,6 @@ void StatusBar::StartProgressMode( const OUString& rText ) } } - - void StatusBar::SetProgressValue( sal_uInt16 nNewPercent ) { DBG_ASSERT( mbProgressMode, "StatusBar::SetProgressValue(): no progrss mode" ); @@ -1463,8 +1356,6 @@ void StatusBar::SetProgressValue( sal_uInt16 nNewPercent ) mnPercent = nNewPercent; } - - void StatusBar::EndProgressMode() { DBG_ASSERT( mbProgressMode, "StatusBar::EndProgressMode(): no progress mode" ); @@ -1482,8 +1373,6 @@ void StatusBar::EndProgressMode() } } - - void StatusBar::SetText( const OUString& rText ) { if ( (!mbVisibleItems || (GetStyle() & WB_RIGHT)) && !mbProgressMode && @@ -1517,8 +1406,6 @@ void StatusBar::SetText( const OUString& rText ) Window::SetText( rText ); } - - Size StatusBar::CalcWindowSizePixel() const { size_t i = 0; @@ -1573,9 +1460,6 @@ Size StatusBar::CalcWindowSizePixel() const return Size( nCalcWidth, nCalcHeight ); } - - - void StatusBar::SetAccessibleName( sal_uInt16 nItemId, const OUString& rName ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1592,8 +1476,6 @@ void StatusBar::SetAccessibleName( sal_uInt16 nItemId, const OUString& rName ) } } - - const OUString& StatusBar::GetAccessibleName( sal_uInt16 nItemId ) const { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1603,6 +1485,4 @@ const OUString& StatusBar::GetAccessibleName( sal_uInt16 nItemId ) const return (*mpItemList)[ nPos ]->maAccessibleName; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx index 32c26c097a48..f70d25c67886 100644 --- a/vcl/source/window/syschild.cxx +++ b/vcl/source/window/syschild.cxx @@ -52,8 +52,6 @@ using namespace ::com::sun::star; - - long ImplSysChildProc( void* pInst, SalObject* /* pObject */, sal_uInt16 nEvent, const void* /* pEvent */ ) { @@ -109,8 +107,6 @@ long ImplSysChildProc( void* pInst, SalObject* /* pObject */, return nRet; } - - void SystemChildWindow::ImplInitSysChild( Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow ) { mpWindowImpl->mpSysObj = ImplGetSVData()->mpDefInst->CreateObject( pParent->ImplGetFrame(), pData, bShow ); @@ -126,24 +122,18 @@ void SystemChildWindow::ImplInitSysChild( Window* pParent, WinBits nStyle, Syste } } - - SystemChildWindow::SystemChildWindow( Window* pParent, WinBits nStyle ) : Window( WINDOW_SYSTEMCHILDWINDOW ) { ImplInitSysChild( pParent, nStyle, NULL ); } - - SystemChildWindow::SystemChildWindow( Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow ) : Window( WINDOW_SYSTEMCHILDWINDOW ) { ImplInitSysChild( pParent, nStyle, pData, bShow ); } - - SystemChildWindow::~SystemChildWindow() { Hide(); @@ -154,8 +144,6 @@ SystemChildWindow::~SystemChildWindow() } } - - const SystemEnvData* SystemChildWindow::GetSystemData() const { if ( mpWindowImpl->mpSysObj ) @@ -164,16 +152,12 @@ const SystemEnvData* SystemChildWindow::GetSystemData() const return NULL; } - - void SystemChildWindow::EnableEraseBackground( bool bEnable ) { if ( mpWindowImpl->mpSysObj ) mpWindowImpl->mpSysObj->EnableEraseBackground( bEnable ); } - - void SystemChildWindow::ImplTestJavaException( void* pEnv ) { #if HAVE_FEATURE_JAVA @@ -212,8 +196,6 @@ void SystemChildWindow::SetForwardKey( bool bEnable ) mpWindowImpl->mpSysObj->SetForwardKey( bEnable ); } - - sal_IntPtr SystemChildWindow::GetParentWindowHandle( bool bUseJava ) { sal_IntPtr nRet = 0; diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 06635c8e7bb9..d24f76bbdfbb 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; - class SystemWindow::ImplData { public: @@ -65,8 +64,6 @@ SystemWindow::ImplData::~ImplData() delete mpTaskPaneList; } - - SystemWindow::SystemWindow( WindowType nType ) : Window( nType ) { @@ -91,8 +88,6 @@ SystemWindow::~SystemWindow() mpImplData = NULL; } - - bool SystemWindow::Notify( NotifyEvent& rNEvt ) { // capture KeyEvents for menu handling @@ -112,8 +107,6 @@ bool SystemWindow::Notify( NotifyEvent& rNEvt ) return Window::Notify( rNEvt ); } - - bool SystemWindow::PreNotify( NotifyEvent& rNEvt ) { // capture KeyEvents for taskpane cycling @@ -156,8 +149,6 @@ bool SystemWindow::PreNotify( NotifyEvent& rNEvt ) return Window::PreNotify( rNEvt ); } - - TaskPaneList* SystemWindow::GetTaskPaneList() { if( mpImplData->mpTaskPaneList ) @@ -178,8 +169,6 @@ TaskPaneList* SystemWindow::GetTaskPaneList() } } - - bool SystemWindow::Close() { ImplDelData aDelData; @@ -207,32 +196,22 @@ bool SystemWindow::Close() return true; } - - void SystemWindow::TitleButtonClick( sal_uInt16 ) { } - - void SystemWindow::Pin() { } - - void SystemWindow::Roll() { } - - void SystemWindow::Resizing( Size& ) { } - - void SystemWindow::SetRepresentedURL( const OUString& i_rURL ) { bool bChanged = (i_rURL != mpImplData->maRepresentedURL); @@ -248,8 +227,6 @@ void SystemWindow::SetRepresentedURL( const OUString& i_rURL ) } } - - void SystemWindow::SetIcon( sal_uInt16 nIcon ) { if ( mnIcon == nIcon ) @@ -268,8 +245,6 @@ void SystemWindow::SetIcon( sal_uInt16 nIcon ) } } - - void SystemWindow::EnableSaveBackground( bool bSave ) { if( ImplGetSVData()->maWinData.mbNoSaveBackground ) @@ -286,8 +261,6 @@ void SystemWindow::EnableSaveBackground( bool bSave ) } } - - bool SystemWindow::IsSaveBackgroundEnabled() const { const Window* pWindow = this; @@ -299,8 +272,6 @@ bool SystemWindow::IsSaveBackgroundEnabled() const return false; } - - void SystemWindow::ShowTitleButton( sal_uInt16 nButton, bool bVisible ) { if ( nButton == TITLE_BUTTON_DOCKING ) @@ -330,8 +301,6 @@ void SystemWindow::ShowTitleButton( sal_uInt16 nButton, bool bVisible ) return; } - - bool SystemWindow::IsTitleButtonVisible( sal_uInt16 nButton ) const { if ( nButton == TITLE_BUTTON_DOCKING ) @@ -340,8 +309,6 @@ bool SystemWindow::IsTitleButtonVisible( sal_uInt16 nButton ) const return mbHideBtn; } - - void SystemWindow::SetPin( bool bPin ) { if ( bPin != mbPinned ) @@ -352,8 +319,6 @@ void SystemWindow::SetPin( bool bPin ) } } - - void SystemWindow::RollUp() { if ( !mbRollUp ) @@ -372,8 +337,6 @@ void SystemWindow::RollUp() } } - - void SystemWindow::RollDown() { if ( mbRollUp ) @@ -386,8 +349,6 @@ void SystemWindow::RollDown() } } - - void SystemWindow::SetMinOutputSizePixel( const Size& rSize ) { maMinOutSize = rSize; @@ -401,8 +362,6 @@ void SystemWindow::SetMinOutputSizePixel( const Size& rSize ) mpWindowImpl->mpFrame->SetMinClientSize( rSize.Width(), rSize.Height() ); } - - void SystemWindow::SetMaxOutputSizePixel( const Size& rSize ) { Size aSize( rSize ); @@ -427,7 +386,6 @@ const Size& SystemWindow::GetMaxOutputSizePixel() const return mpImplData->maMaxOutSize; } - Size SystemWindow::GetResizeOutputSizePixel() const { Size aSize = GetOutputSizePixel(); @@ -438,8 +396,6 @@ Size SystemWindow::GetResizeOutputSizePixel() const return aSize; } - - static void ImplWindowStateFromStr(WindowStateData& rData, const OString& rStr) { @@ -554,8 +510,6 @@ static void ImplWindowStateFromStr(WindowStateData& rData, rData.SetMask( nValidMask ); } - - static OString ImplWindowStateToStr(const WindowStateData& rData) { sal_uLong nValidMask = rData.GetMask(); @@ -600,8 +554,6 @@ static OString ImplWindowStateToStr(const WindowStateData& rData) return rStrBuf.makeStringAndClear(); } - - void SystemWindow::ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, Window* i_pConfigureWin ) { Rectangle aScreenRect; @@ -810,8 +762,6 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData ) } } - - void SystemWindow::GetWindowStateData( WindowStateData& rData ) const { sal_uLong nValidMask = rData.GetMask(); @@ -897,8 +847,6 @@ void SystemWindow::GetWindowStateData( WindowStateData& rData ) const } } - - void SystemWindow::SetWindowState(const OString& rStr) { if (rStr.isEmpty()) @@ -909,8 +857,6 @@ void SystemWindow::SetWindowState(const OString& rStr) SetWindowStateData( aData ); } - - OString SystemWindow::GetWindowState( sal_uLong nMask ) const { WindowStateData aData; @@ -920,8 +866,6 @@ OString SystemWindow::GetWindowState( sal_uLong nMask ) const return ImplWindowStateToStr(aData); } - - void SystemWindow::SetMenuBar( MenuBar* pMenuBar ) { if ( mpMenuBar != pMenuBar ) @@ -984,8 +928,6 @@ void SystemWindow::SetMenuBar( MenuBar* pMenuBar ) } } - - void SystemWindow::SetMenuBarMode( sal_uInt16 nMode ) { if ( mnMenuBarMode != nMode ) @@ -1001,8 +943,6 @@ void SystemWindow::SetMenuBarMode( sal_uInt16 nMode ) } } - - bool SystemWindow::ImplIsInTaskPaneList( Window* pWin ) { if( mpImplData && mpImplData->mpTaskPaneList ) diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx index b5c6b8df2719..68bfa0d6beba 100644 --- a/vcl/source/window/tabdlg.cxx +++ b/vcl/source/window/tabdlg.cxx @@ -23,10 +23,6 @@ #include <vcl/tabdlg.hxx> #include <tools/rc.h> - - - - void TabDialog::ImplInitTabDialogData() { mpFixedLine = NULL; @@ -35,8 +31,6 @@ void TabDialog::ImplInitTabDialogData() mbPosControls = true; } - - void TabDialog::ImplPosControls() { if (isLayoutEnabled()) @@ -212,8 +206,6 @@ void TabDialog::ImplPosControls() mbPosControls = false; } - - TabDialog::TabDialog( Window* pParent, WinBits nStyle ) : Dialog( WINDOW_TABDIALOG ) { @@ -221,8 +213,6 @@ TabDialog::TabDialog( Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } - - TabDialog::TabDialog( Window* pParent, const ResId& rResId ) : Dialog( WINDOW_TABDIALOG ) { @@ -237,15 +227,11 @@ TabDialog::TabDialog( Window* pParent, const OString& rID, const OUString& rUIXM ImplInitTabDialogData(); } - - TabDialog::~TabDialog() { delete mpFixedLine; } - - void TabDialog::StateChanged( StateChangedType nType ) { if ( nType == STATE_CHANGE_INITSHOW ) @@ -257,8 +243,6 @@ void TabDialog::StateChanged( StateChangedType nType ) Dialog::StateChanged( nType ); } - - void TabDialog::AdjustLayout() { SAL_WARN_IF(isLayoutEnabled(), "vcl.layout", "unnecessary to call TabDialog::AdjustLayout when layout enabled"); diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx index 2ec86723ff37..a733824ece12 100644 --- a/vcl/source/window/tabpage.cxx +++ b/vcl/source/window/tabpage.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/rc.h> #include <vcl/event.hxx> @@ -32,8 +31,6 @@ #include <com/sun/star/accessibility/XAccessible.hpp> - - void TabPage::ImplInit( Window* pParent, WinBits nStyle ) { if ( !(nStyle & WB_NODIALOGCONTROL) ) @@ -49,8 +46,6 @@ void TabPage::ImplInit( Window* pParent, WinBits nStyle ) EnableChildTransparentMode( true ); } - - void TabPage::ImplInitSettings() { Window* pParent = GetParent(); @@ -74,16 +69,12 @@ void TabPage::ImplInitSettings() } } - - TabPage::TabPage( Window* pParent, WinBits nStyle ) : Window( WINDOW_TABPAGE ) { ImplInit( pParent, nStyle ); } - - TabPage::TabPage( Window* pParent, const ResId& rResId ) : Window( WINDOW_TABPAGE ) { @@ -103,8 +94,6 @@ TabPage::TabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDesc m_pUIBuilder = new VclBuilder(this, getUIRootDir(), rUIXMLDescription, rID); } - - void TabPage::StateChanged( StateChangedType nType ) { Window::StateChanged( nType ); @@ -123,8 +112,6 @@ void TabPage::StateChanged( StateChangedType nType ) } } - - void TabPage::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); @@ -137,8 +124,6 @@ void TabPage::DataChanged( const DataChangedEvent& rDCEvt ) } } - - void TabPage::Paint( const Rectangle& ) { // draw native tabpage only inside tabcontrols, standalone tabpages look ugly (due to bad dialog design) @@ -161,7 +146,6 @@ void TabPage::Paint( const Rectangle& ) } } - void TabPage::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong ) { Point aPos = pDev->LogicToPixel( rPos ); @@ -189,14 +173,10 @@ void TabPage::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sa pDev->Pop(); } - - void TabPage::ActivatePage() { } - - void TabPage::DeactivatePage() { } diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx index 47ed31576464..c70056d7e221 100644 --- a/vcl/source/window/taskpanelist.cxx +++ b/vcl/source/window/taskpanelist.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/rcid.h> #include <vcl/dockwin.hxx> @@ -75,8 +74,6 @@ struct LTRSortBackward : public ::std::binary_function< const Window*, const Win } }; - - static void ImplTaskPaneListGrabFocus( Window *pWindow, bool bForward ) { // put focus in child of floating windows which is typically a toolbar @@ -86,8 +83,6 @@ static void ImplTaskPaneListGrabFocus( Window *pWindow, bool bForward ) pWindow->ImplGrabFocus( GETFOCUS_F6 | (bForward ? GETFOCUS_FORWARD : GETFOCUS_BACKWARD)); } - - TaskPaneList::TaskPaneList() { } @@ -96,8 +91,6 @@ TaskPaneList::~TaskPaneList() { } - - void TaskPaneList::AddWindow( Window *pWindow ) { if( pWindow ) @@ -136,8 +129,6 @@ void TaskPaneList::AddWindow( Window *pWindow ) } } - - void TaskPaneList::RemoveWindow( Window *pWindow ) { ::std::vector< Window* >::iterator p; @@ -149,8 +140,6 @@ void TaskPaneList::RemoveWindow( Window *pWindow ) } } - - bool TaskPaneList::IsInList( Window *pWindow ) { ::std::vector< Window* >::iterator p; @@ -161,8 +150,6 @@ bool TaskPaneList::IsInList( Window *pWindow ) return false; } - - bool TaskPaneList::HandleKeyEvent( KeyEvent aKeyEvent ) { @@ -249,8 +236,6 @@ bool TaskPaneList::HandleKeyEvent( KeyEvent aKeyEvent ) return false; } - - // returns next splitter Window* TaskPaneList::FindNextSplitter( Window *pWindow, bool bForward ) { @@ -288,8 +273,6 @@ Window* TaskPaneList::FindNextSplitter( Window *pWindow, bool bForward ) return pWindow; } - - // returns first valid item (regardless of type) if pWindow==0, otherwise returns next valid float Window* TaskPaneList::FindNextFloat( Window *pWindow, bool bForward ) { @@ -332,6 +315,4 @@ Window* TaskPaneList::FindNextFloat( Window *pWindow, bool bForward ) return pWindow; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 61204c9bac0d..b8d4841e0b4f 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #include <tools/debug.hxx> #include <tools/rc.h> #include <tools/poly.hxx> @@ -50,19 +48,12 @@ #include <vector> #include <math.h> - - - - - #define SMALLBUTTON_HSIZE 7 #define SMALLBUTTON_VSIZE 7 #define SMALLBUTTON_OFF_NORMAL_X 3 #define SMALLBUTTON_OFF_NORMAL_Y 3 - - #define TB_TEXTOFFSET 2 #define TB_IMAGETEXTOFFSET 3 #define TB_LINESPACING 3 @@ -91,11 +82,8 @@ #define DOCK_LINETOP ((sal_uInt16)0x8000) #define DOCK_LINEOFFSET 3 - - static void ImplDrawButton( ToolBox* pThis, const Rectangle &rRect, sal_uInt16 highlight, bool bChecked, bool bEnabled, bool bIsWindow ); - typedef ::std::vector< ToolBox* > ImplTBList; class ImplTBDragMgr @@ -150,8 +138,6 @@ public: bool IsResizeMode() { return mbResizeMode; } }; - - static ImplTBDragMgr* ImplGetTBDragMgr() { ImplSVData* pSVData = ImplGetSVData(); @@ -160,8 +146,6 @@ static ImplTBDragMgr* ImplGetTBDragMgr() return pSVData->maCtrlData.mpTBDragMgr; } - - int ToolBox::ImplGetDragWidth( ToolBox* pThis ) { #define TB_DRAGWIDTH 8 // the default width of the grip @@ -199,8 +183,6 @@ ButtonType determineButtonType( ImplToolItem* pItem, ButtonType defaultType ) return tmpButtonType; } - - void ToolBox::ImplUpdateDragArea( ToolBox *pThis ) { ImplDockingWindowWrapper *pWrapper = ImplGetDockingManager()->GetDockingWindowWrapper( pThis ); @@ -218,8 +200,6 @@ void ToolBox::ImplUpdateDragArea( ToolBox *pThis ) } } - - void ToolBox::ImplCalcBorder( WindowAlign eAlign, long& rLeft, long& rTop, long& rRight, long& rBottom, const ToolBox *pThis ) { @@ -268,8 +248,6 @@ void ToolBox::ImplCalcBorder( WindowAlign eAlign, long& rLeft, long& rTop, } } - - static void ImplCheckUpdate( ToolBox *pThis ) { // remove any pending invalidates to avoid @@ -282,8 +260,6 @@ static void ImplCheckUpdate( ToolBox *pThis ) pThis->Update(); } - - void ToolBox::ImplDrawGrip( ToolBox* pThis ) { ImplDockingWindowWrapper *pWrapper = ImplGetDockingManager()->GetDockingWindowWrapper( pThis ); @@ -519,7 +495,6 @@ void ToolBox::ImplDrawConstantBackground( ToolBox* pThis, const Region &rRegion, } } - void ToolBox::ImplDrawBackground( ToolBox* pThis, const Rectangle &rRect ) { // execute pending paint requests @@ -537,7 +512,6 @@ void ToolBox::ImplDrawBackground( ToolBox* pThis, const Rectangle &rRect ) pThis->Push( PUSH_CLIPREGION ); pThis->IntersectClipRegion( aPaintRegion ); - if( !pWrapper /*|| bIsInPopupMode*/ ) { // no gradient for ordinary toolbars (not dockable) @@ -653,7 +627,6 @@ void ToolBox::ImplDrawBorder( ToolBox* pWin ) } } - if ( pWin->meAlign == WINDOWALIGN_BOTTOM || pWin->meAlign == WINDOWALIGN_TOP ) { // draw right border @@ -664,8 +637,6 @@ void ToolBox::ImplDrawBorder( ToolBox* pWin ) } } - - static bool ImplIsFixedControl( const ImplToolItem *pItem ) { return ( pItem->mpWindow && @@ -674,8 +645,6 @@ static bool ImplIsFixedControl( const ImplToolItem *pItem ) pItem->mpWindow->GetType() == WINDOW_GROUPBOX) ); } - - const ImplToolItem *ToolBox::ImplGetFirstClippedItem( const ToolBox* pThis ) { std::vector< ImplToolItem >::const_iterator it; @@ -689,8 +658,6 @@ const ImplToolItem *ToolBox::ImplGetFirstClippedItem( const ToolBox* pThis ) return NULL; } - - Size ToolBox::ImplCalcSize( const ToolBox* pThis, sal_uInt16 nCalcLines, sal_uInt16 nCalcMode ) { long nMax; @@ -807,8 +774,6 @@ Size ToolBox::ImplCalcSize( const ToolBox* pThis, sal_uInt16 nCalcLines, sal_uIn return aSize; } - - void ToolBox::ImplCalcFloatSizes( ToolBox* pThis ) { if ( !pThis->maFloatSizes.empty() ) @@ -874,8 +839,6 @@ void ToolBox::ImplCalcFloatSizes( ToolBox* pThis ) } } - - Size ToolBox::ImplCalcFloatSize( ToolBox* pThis, sal_uInt16& rLines ) { ImplCalcFloatSizes( pThis ); @@ -901,8 +864,6 @@ Size ToolBox::ImplCalcFloatSize( ToolBox* pThis, sal_uInt16& rLines ) return aSize; } - - void ToolBox::ImplCalcMinMaxFloatSize( ToolBox* pThis, Size& rMinSize, Size& rMaxSize ) { ImplCalcFloatSizes( pThis ); @@ -943,9 +904,6 @@ void ToolBox::ImplSetMinMaxFloatSize( ToolBox *pThis ) } } - - - sal_uInt16 ToolBox::ImplCalcLines( ToolBox* pThis, long nToolSize ) { long nLineHeight; @@ -977,8 +935,6 @@ sal_uInt16 ToolBox::ImplCalcLines( ToolBox* pThis, long nToolSize ) return static_cast<sal_uInt16>(nLines); } - - sal_uInt16 ToolBox::ImplTestLineSize( ToolBox* pThis, const Point& rPos ) { if ( !pThis->ImplIsFloatingMode() && @@ -1011,8 +967,6 @@ sal_uInt16 ToolBox::ImplTestLineSize( ToolBox* pThis, const Point& rPos ) return 0; } - - void ToolBox::ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRect, sal_uInt16 nLineMode ) { @@ -1107,8 +1061,6 @@ void ToolBox::ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRec pThis->mnDockLines = i; } - - sal_uInt16 ToolBox::ImplFindItemPos( ToolBox* pBox, const Point& rPos ) { sal_uInt16 nPos = 0; @@ -1193,8 +1145,6 @@ ImplTBDragMgr::~ImplTBDragMgr() delete mpBoxList; } - - ToolBox* ImplTBDragMgr::FindToolBox( const Rectangle& rRect ) { for ( size_t i = 0, n = mpBoxList->size(); i < n; ++i ) @@ -1224,8 +1174,6 @@ ToolBox* ImplTBDragMgr::FindToolBox( const Rectangle& rRect ) return NULL; } - - void ImplTBDragMgr::StartDragging( ToolBox* pToolBox, const Point& rPos, const Rectangle& rRect, sal_uInt16 nDragLineMode, bool bResizeItem, @@ -1269,8 +1217,6 @@ void ImplTBDragMgr::StartDragging( ToolBox* pToolBox, pToolBox->ShowTracking( maRect ); } - - void ImplTBDragMgr::Dragging( const Point& rPos ) { if ( mnLineMode ) @@ -1303,8 +1249,6 @@ void ImplTBDragMgr::Dragging( const Point& rPos ) } } - - void ImplTBDragMgr::EndDragging( bool bOK ) { mpDragBox->HideTracking(); @@ -1391,8 +1335,6 @@ void ImplTBDragMgr::EndDragging( bool bOK ) mpDragBox = NULL; } - - void ImplTBDragMgr::UpdateDragRect() { // Only update if we're already dragging @@ -1402,8 +1344,6 @@ void ImplTBDragMgr::UpdateDragRect() mpDragBox->ShowTracking( maRect ); } - - IMPL_LINK( ImplTBDragMgr, SelectHdl, Accelerator*, pAccel ) { if ( pAccel->GetCurItemId() == KEY_ESCAPE ) @@ -1414,8 +1354,6 @@ IMPL_LINK( ImplTBDragMgr, SelectHdl, Accelerator*, pAccel ) return (long) true; } - - void ToolBox::ImplInit( Window* pParent, WinBits nStyle ) { @@ -1483,7 +1421,6 @@ void ToolBox::ImplInit( Window* pParent, WinBits nStyle ) DockingWindow::ImplInit( pParent, nStyle & ~(WB_BORDER) ); - // always set WB_TABSTOP for ToolBars !!! if( mnWinStyle & WB_TABSTOP ) { // dockingwindow's ImplInit removes some bits, so restore them here @@ -1495,8 +1432,6 @@ void ToolBox::ImplInit( Window* pParent, WinBits nStyle ) ImplInitSettings( true, true, true ); } - - void ToolBox::ImplInitSettings( bool bFont, bool bForeground, bool bBackground ) { @@ -1562,8 +1497,6 @@ void ToolBox::ImplInitSettings( bool bFont, } } - - void ToolBox::ImplLoadRes( const ResId& rResId ) { ResMgr* pMgr = rResId.GetResMgr(); @@ -1619,16 +1552,12 @@ void ToolBox::ImplLoadRes( const ResId& rResId ) } } - - ToolBox::ToolBox( Window* pParent, WinBits nStyle ) : DockingWindow( WINDOW_TOOLBOX ) { ImplInit( pParent, nStyle ); } - - ToolBox::ToolBox( Window* pParent, const ResId& rResId ) : DockingWindow( WINDOW_TOOLBOX ) { @@ -1650,8 +1579,6 @@ ToolBox::ToolBox( Window* pParent, const ResId& rResId ) : Show(); } - - ToolBox::~ToolBox() { // custom menu event still running? @@ -1687,8 +1614,6 @@ ToolBox::~ToolBox() } } - - ImplToolItem* ToolBox::ImplGetItem( sal_uInt16 nItemId ) const { std::vector< ImplToolItem >::iterator it = mpData->m_aItems.begin(); @@ -1702,7 +1627,6 @@ ImplToolItem* ToolBox::ImplGetItem( sal_uInt16 nItemId ) const return NULL; } - static void ImplAddButtonBorder( long &rWidth, long& rHeight, bool bNativeButtons ) { rWidth += SMALLBUTTON_HSIZE; @@ -1716,8 +1640,6 @@ static void ImplAddButtonBorder( long &rWidth, long& rHeight, bool bNativeButton } } - - bool ToolBox::ImplCalcItem() { @@ -2004,8 +1926,6 @@ bool ToolBox::ImplCalcItem() return false; } - - sal_uInt16 ToolBox::ImplCalcBreaks( long nWidth, long* pMaxLineWidth, bool bCalcHorz ) { sal_uLong nLineStart = 0; @@ -2136,7 +2056,6 @@ sal_uInt16 ToolBox::ImplCalcBreaks( long nWidth, long* pMaxLineWidth, bool bCalc ++it; } - if ( pMaxLineWidth ) { if ( nLineWidth > nMaxLineWidth ) @@ -2155,8 +2074,6 @@ sal_uInt16 ToolBox::ImplCalcBreaks( long nWidth, long* pMaxLineWidth, bool bCalc return nLines; } - - Size ToolBox::ImplGetOptimalFloatingSize() { if( !ImplIsFloatingMode() ) @@ -2290,7 +2207,6 @@ void ToolBox::ImplFormat( bool bResize ) else bMustFullPaint = false; - // calculate new size during interactive resize or // set computed size when formatting only if ( ImplIsFloatingMode() ) @@ -2620,7 +2536,6 @@ void ToolBox::ImplFormat( bool bResize ) // we have no toolbox items mnCurLines = 1; - if( IsMenuEnabled() && ImplIsFloatingMode() && !ImplHasExternalMenubutton() && !bIsInPopupMode ) { // custom menu will be the last button in floating mode @@ -2644,7 +2559,6 @@ void ToolBox::ImplFormat( bool bResize ) } } - // if toolbox visible trigger paint for changed regions if ( IsVisible() && !mbFullPaint ) { @@ -2705,8 +2619,6 @@ void ToolBox::ImplFormat( bool bResize ) mbFormat = false; } - - IMPL_LINK_NOARG(ToolBox, ImplDropdownLongClickHdl) { if( mnCurPos != TOOLBOX_ITEM_NOTFOUND && @@ -2736,8 +2648,6 @@ IMPL_LINK_NOARG(ToolBox, ImplDropdownLongClickHdl) return 0; } - - IMPL_LINK_NOARG(ToolBox, ImplUpdateHdl) { @@ -2747,7 +2657,6 @@ IMPL_LINK_NOARG(ToolBox, ImplUpdateHdl) return 0; } - static void ImplDrawMoreIndicator( ToolBox *pBox, const Rectangle& rRect, bool bSetColor, bool bRotate ) { Color aOldFillColor = pBox->GetFillColor(); @@ -2875,8 +2784,6 @@ static void ImplDrawDropdownArrow( ToolBox *pBox, const Rectangle& rDropDownRect pBox->SetLineColor( ); } - - void ToolBox::ImplDrawMenubutton( ToolBox *pThis, bool bHighlight ) { if( !pThis->mpData->maMenubuttonItem.maRect.IsEmpty() ) @@ -2917,8 +2824,6 @@ void ToolBox::ImplDrawMenubutton( ToolBox *pThis, bool bHighlight ) } } - - void ToolBox::ImplDrawSpin( bool bUpperIn, bool bLowerIn ) { @@ -2948,8 +2853,6 @@ void ToolBox::ImplDrawSpin( bool bUpperIn, bool bLowerIn ) bUpperIn, bLowerIn, bTmpUpper, bTmpLower, !mbHorz ); } - - void ToolBox::ImplDrawSeparator( sal_uInt16 nPos, Rectangle rRect ) { bool bNativeOk = false; @@ -2997,8 +2900,6 @@ void ToolBox::ImplDrawSeparator( sal_uInt16 nPos, Rectangle rRect ) } } - - static void ImplDrawButton( ToolBox* pThis, const Rectangle &rRect, sal_uInt16 highlight, bool bChecked, bool bEnabled, bool bIsWindow ) { // draws toolbar button background either native or using a coloured selection @@ -3016,7 +2917,6 @@ static void ImplDrawButton( ToolBox* pThis, const Rectangle &rRect, sal_uInt16 h aControlValue.setTristateVal( bChecked ? BUTTONVALUE_ON : BUTTONVALUE_OFF ); - bNativeOk = pThis->DrawNativeControl( CTRL_TOOLBAR, PART_BUTTON, rRect, nState, aControlValue, OUString() ); } @@ -3353,8 +3253,6 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, bool bPaint, pMgr->UpdateDragRect(); } - - void ToolBox::ImplDrawFloatwinBorder( ImplToolItem* pItem ) { if ( !pItem->maRect.IsEmpty() ) @@ -3412,7 +3310,6 @@ void ToolBox::ImplFloatControl( bool bStart, FloatingWindow* pFloatWindow ) // draw current item with highlight and keep old state bool bWasKeyboardActivate = mpData->mbDropDownByKeyboard; - if ( mnCurPos != TOOLBOX_ITEM_NOTFOUND ) ImplDrawItem( mnCurPos, bWasKeyboardActivate ? 2 : 0 ); Deactivate(); @@ -3428,8 +3325,6 @@ void ToolBox::ImplFloatControl( bool bStart, FloatingWindow* pFloatWindow ) } } - - void ToolBox::ShowLine( bool bNext ) { @@ -3463,8 +3358,6 @@ void ToolBox::ShowLine( bool bNext ) ImplFormat(); } - - bool ToolBox::ImplHandleMouseMove( const MouseEvent& rMEvt, bool bRepeat ) { Point aMousePos = rMEvt.GetPosPixel(); @@ -3525,8 +3418,6 @@ bool ToolBox::ImplHandleMouseMove( const MouseEvent& rMEvt, bool bRepeat ) return false; } - - bool ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, bool bCancel ) { ImplDisableFlatButtons(); @@ -3643,8 +3534,6 @@ bool ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, bool bCancel ) return false; } - - void ToolBox::MouseMove( const MouseEvent& rMEvt ) { // pressing a modifier generates synthetic mouse moves @@ -3864,8 +3753,6 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt ) DockingWindow::MouseMove( rMEvt ); } - - void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) { // only trigger toolbox for left mouse button and when @@ -3937,7 +3824,6 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) return; } - // update actual data sal_uInt16 nTrackFlags = 0; mnCurPos = i; @@ -3948,7 +3834,6 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) if ( it->mnBits & TIB_REPEAT ) nTrackFlags |= STARTTRACK_BUTTONREPEAT; - if ( mbSelection ) { ImplDrawItem( mnCurPos, 1 ); @@ -3965,7 +3850,6 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) if ( rMEvt.GetClicks() == 2 ) DoubleClick(); - if ( mbDrag ) { ImplDrawItem( mnCurPos, 1 ); @@ -4004,7 +3888,6 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) mpData->maDropdownTimer.Start(); } - // call Click handler if ( rMEvt.GetClicks() != 2 ) Click(); @@ -4090,8 +3973,6 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) DockingWindow::MouseButtonDown( rMEvt ); } - - void ToolBox::MouseButtonUp( const MouseEvent& rMEvt ) { if ( ImplHandleMouseButtonUp( rMEvt ) ) @@ -4108,8 +3989,6 @@ void ToolBox::MouseButtonUp( const MouseEvent& rMEvt ) DockingWindow::MouseButtonUp( rMEvt ); } - - void ToolBox::Tracking( const TrackingEvent& rTEvt ) { ImplDelData aDelData; @@ -4127,8 +4006,6 @@ void ToolBox::Tracking( const TrackingEvent& rTEvt ) DockingWindow::Tracking( rTEvt ); } - - void ToolBox::Paint( const Rectangle& rPaintRect ) { if( mpData->mbIsPaintLocked ) @@ -4138,7 +4015,6 @@ void ToolBox::Paint( const Rectangle& rPaintRect ) ImplFormat(); mbFullPaint = false; - ImplDrawBackground( this, rPaintRect ); if ( (mnWinStyle & WB_BORDER) && !ImplIsFloatingMode() ) @@ -4182,15 +4058,11 @@ void ToolBox::Paint( const Rectangle& rPaintRect ) ImplShowFocus(); } - - void ToolBox::Move() { DockingWindow::Move(); } - - void ToolBox::Resize() { Size aSize = GetOutputSizePixel(); @@ -4299,7 +4171,6 @@ void ToolBox::Resize() } } - const OUString& ToolBox::ImplGetHelpText( sal_uInt16 nItemId ) const { ImplToolItem* pItem = ImplGetItem( nItemId ); @@ -4321,8 +4192,6 @@ const OUString& ToolBox::ImplGetHelpText( sal_uInt16 nItemId ) const return pItem->maHelpText; } - - void ToolBox::RequestHelp( const HelpEvent& rHEvt ) { sal_uInt16 nItemId; @@ -4398,8 +4267,6 @@ void ToolBox::RequestHelp( const HelpEvent& rHEvt ) DockingWindow::RequestHelp( rHEvt ); } - - bool ToolBox::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_KEYINPUT ) @@ -4483,8 +4350,6 @@ bool ToolBox::Notify( NotifyEvent& rNEvt ) return DockingWindow::Notify( rNEvt ); } - - void ToolBox::Command( const CommandEvent& rCEvt ) { if ( maCommandHandler.IsSet() ) @@ -4549,8 +4414,6 @@ void ToolBox::Command( const CommandEvent& rCEvt ) DockingWindow::Command( rCEvt ); } - - void ToolBox::StateChanged( StateChangedType nType ) { DockingWindow::StateChanged( nType ); @@ -4587,8 +4450,6 @@ void ToolBox::StateChanged( StateChangedType nType ) maStateChangedHandler.Call( &nType ); } - - void ToolBox::DataChanged( const DataChangedEvent& rDCEvt ) { DockingWindow::DataChanged( rDCEvt ); @@ -4609,15 +4470,11 @@ void ToolBox::DataChanged( const DataChangedEvent& rDCEvt ) maDataChangedHandler.Call( (void*)&rDCEvt ); } - - bool ToolBox::PrepareToggleFloatingMode() { return DockingWindow::PrepareToggleFloatingMode(); } - - void ToolBox::ToggleFloatingMode() { DockingWindow::ToggleFloatingMode(); @@ -4660,8 +4517,6 @@ void ToolBox::ToggleFloatingMode() ImplFormat(); } - - void ToolBox::StartDocking() { meDockAlign = meAlign; @@ -4670,8 +4525,6 @@ void ToolBox::StartDocking() DockingWindow::StartDocking(); } - - bool ToolBox::Docking( const Point& rPos, Rectangle& rRect ) { // do nothing during dragging, it was calculated before @@ -4796,8 +4649,6 @@ bool ToolBox::Docking( const Point& rPos, Rectangle& rRect ) return bFloatMode; } - - void ToolBox::EndDocking( const Rectangle& rRect, bool bFloatMode ) { if ( !IsDockingCanceled() ) @@ -4811,8 +4662,6 @@ void ToolBox::EndDocking( const Rectangle& rRect, bool bFloatMode ) DockingWindow::EndDocking( rRect, bFloatMode ); } - - void ToolBox::Resizing( Size& rSize ) { sal_uInt16 nCalcLines; @@ -4957,8 +4806,6 @@ Size ToolBox::CalcFloatingWindowSizePixel( sal_uInt16 nCalcLines ) const return aSize; } - - Size ToolBox::CalcMinimumWindowSizePixel() const { if( ImplIsFloatingMode() ) @@ -5000,8 +4847,6 @@ Size ToolBox::CalcMinimumWindowSizePixel() const } } - - void ToolBox::EnableCustomize( bool bEnable ) { if ( bEnable != mbCustomize ) @@ -5016,15 +4861,11 @@ void ToolBox::EnableCustomize( bool bEnable ) } } - - void ToolBox::GetFocus() { DockingWindow::GetFocus(); } - - void ToolBox::LoseFocus() { ImplChangeHighlight( NULL, true ); @@ -5032,8 +4873,6 @@ void ToolBox::LoseFocus() DockingWindow::LoseFocus(); } - - // performs the action associated with an item, ie simulates clicking the item void ToolBox::TriggerItem( sal_uInt16 nItemId, bool bShift, bool bCtrl ) { @@ -5047,8 +4886,6 @@ void ToolBox::TriggerItem( sal_uInt16 nItemId, bool bShift, bool bCtrl ) ImplActivateItem( aKeyCode ); } - - // calls the button's action handler // returns true if action was called bool ToolBox::ImplActivateItem( KeyCode aKeyCode ) @@ -5111,8 +4948,6 @@ bool ToolBox::ImplActivateItem( KeyCode aKeyCode ) return bRet; } - - bool ImplCloseLastPopup( Window *pParent ) { // close last popup toolbox (see also: @@ -5178,8 +5013,6 @@ bool ToolBox::ImplOpenItem( KeyCode aKeyCode ) return bRet; } - - void ToolBox::KeyInput( const KeyEvent& rKEvt ) { KeyCode aKeyCode = rKEvt.GetKeyCode(); @@ -5368,8 +5201,6 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt ) DockingWindow::KeyInput( rKEvt ); } - - // returns the current toolbox line of the item sal_uInt16 ToolBox::ImplGetItemLine( ImplToolItem* pCurrentItem ) { @@ -5418,8 +5249,6 @@ ImplToolItem* ToolBox::ImplGetFirstValidItem( sal_uInt16 nLine ) return (it == mpData->m_aItems.end()) ? NULL : &(*it); } - - sal_uInt16 ToolBox::ImplFindItemPos( const ImplToolItem* pItem, const std::vector< ImplToolItem >& rList ) { if( pItem ) @@ -5516,8 +5345,6 @@ void ToolBox::ImplChangeHighlight( ImplToolItem* pItem, bool bNoGrabFocus ) mbChangingHighlight = false; } - - // check for keyboard accessible items static bool ImplIsValidItem( const ImplToolItem* pItem, bool bNotClipped ) { @@ -5527,8 +5354,6 @@ static bool ImplIsValidItem( const ImplToolItem* pItem, bool bNotClipped ) return bValid; } - - bool ToolBox::ImplChangeHighlightUpDn( bool bUp, bool bNoCycle ) { ImplToolItem* pToolItem = ImplGetItem( mnHighItemId ); @@ -5690,8 +5515,6 @@ bool ToolBox::ImplChangeHighlightUpDn( bool bUp, bool bNoCycle ) return true; } - - void ToolBox::ImplShowFocus() { if( mnHighItemId && HasFocus() ) @@ -5706,8 +5529,6 @@ void ToolBox::ImplShowFocus() } } - - void ToolBox::ImplHideFocus() { if( mnHighItemId ) @@ -5728,8 +5549,6 @@ void ToolBox::ImplHideFocus() } } - - void ToolBox::ImplDisableFlatButtons() { #ifdef WNT // Check in the Windows registry if an AT tool wants no flat toolboxes diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index c62016ec728b..5f433848f65e 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -72,7 +72,6 @@ ImplToolBoxPrivateData::ImplToolBoxPrivateData() : maMenubuttonItem.meState = TRISTATE_FALSE; mnMenuButtonWidth = TB_MENUBUTTON_SIZE; - mbIsLocked = false; mbNativeButtons = false; mbIsPaintLocked = false; @@ -93,7 +92,6 @@ ImplToolBoxPrivateData::~ImplToolBoxPrivateData() delete mpMenu; } - void ImplToolItem::init(sal_uInt16 nItemId, ToolBoxItemBits nItemBits, bool bEmptyBtn) { @@ -658,7 +656,6 @@ static OUString getCommandLabel(const OUString& rCommand, const uno::Reference<u return OUString(); } - // Get label of the command (like of .uno:Save) from the description service static Image getCommandImage(const OUString& rCommand, bool bLarge, const uno::Reference<uno::XComponentContext>& rContext, const uno::Reference<frame::XFrame>& rFrame, @@ -1114,7 +1111,6 @@ Point ToolBox::ImplGetPopupPosition( const Rectangle& rRect, const Size& rSize ) return aPos; } - Point ToolBox::GetItemPopupPosition( sal_uInt16 nItemId, const Size& rSize ) const { return ImplGetPopupPosition( GetItemRect( nItemId ), rSize ); @@ -1166,7 +1162,6 @@ bool ToolBox::ImplHasExternalMenubutton() return bRet; } - void ToolBox::SetItemBits( sal_uInt16 nItemId, ToolBoxItemBits nBits ) { sal_uInt16 nPos = GetItemPos( nItemId ); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 5bed7e135b94..787d153ba266 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -138,7 +138,6 @@ ImplAccessibleInfos::~ImplAccessibleInfos() delete pAccessibleDescription; } - WindowImpl::WindowImpl( WindowType nType ) { maZoom = Fraction( 1, 1 ); @@ -524,14 +523,11 @@ void Window::ImplInitAppFontData( Window* pWindow ) } } - pSVData->maGDIData.mnRealAppFontX = pSVData->maGDIData.mnAppFontX; if ( pSVData->maAppData.mnDialogScaleX ) pSVData->maGDIData.mnAppFontX += (pSVData->maGDIData.mnAppFontX*pSVData->maAppData.mnDialogScaleX)/100; } - - bool Window::ImplCheckUIFont( const Font& rFont ) { if( ImplGetSVData()->maGDIData.mbNativeFontConfig ) @@ -573,8 +569,6 @@ bool Window::ImplCheckUIFont( const Font& rFont ) return bUIFontOk; } - - void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl ) { StyleSettings aTmpSt( rSettings.GetStyleSettings() ); @@ -815,8 +809,6 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl ) GetpApp()->OverrideSystemSettings( rSettings ); } - - MouseEvent ImplTranslateMouseEvent( const MouseEvent& rE, Window* pSource, Window* pDest ) { Point aPos = pSource->OutputToScreenPixel( rE.GetPosPixel() ); @@ -824,8 +816,6 @@ MouseEvent ImplTranslateMouseEvent( const MouseEvent& rE, Window* pSource, Windo return MouseEvent( aPos, rE.GetClicks(), rE.GetMode(), rE.GetButtons(), rE.GetModifier() ); } - - CommandEvent ImplTranslateCommandEvent( const CommandEvent& rCEvt, Window* pSource, Window* pDest ) { if ( !rCEvt.IsMouseEvent() ) @@ -836,8 +826,6 @@ CommandEvent ImplTranslateCommandEvent( const CommandEvent& rCEvt, Window* pSour return CommandEvent( aPos, rCEvt.GetCommand(), rCEvt.IsMouseEvent(), rCEvt.GetData() ); } - - void Window::ImplInitWindowData( WindowType nType ) { // We will eventually being removing the inheritance of OutputDevice from Window. @@ -845,17 +833,13 @@ void Window::ImplInitWindowData( WindowType nType ) // it will not *be* an OutputDevice mpOutputDevice = (OutputDevice*)this; - mpWindowImpl = new WindowImpl( nType ); meOutDevType = OUTDEV_WINDOW; - mbEnableRTL = Application::GetSettings().GetLayoutRTL(); // true: this outdev will be mirrored if RTL window layout (UI mirroring) is globally active } - - static bool ImplDoTiledRendering() { #if !HAVE_FEATURE_DESKTOP @@ -1157,8 +1141,6 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSyste GetAccessibleParentWindow()->ImplCallEventListeners( VCLEVENT_WINDOW_CHILDCREATED, this ); } - - void Window::ImplSetFrameParent( const Window* pParent ) { Window* pFrameWindow = ImplGetSVData()->maWinData.mpFirstFrame; @@ -1177,8 +1159,6 @@ void Window::ImplSetFrameParent( const Window* pParent ) } } - - void Window::ImplInsertWindow( Window* pParent ) { mpWindowImpl->mpParent = pParent; @@ -1228,8 +1208,6 @@ void Window::ImplInsertWindow( Window* pParent ) } } - - void Window::ImplRemoveWindow( bool bRemoveFrameData ) { // remove window from the lists @@ -1312,8 +1290,6 @@ void Window::reorderWithinParent(sal_uInt16 nNewPosition) mpWindowImpl->mpParent->mpWindowImpl->mpFirstChild = this; } - - void Window::ImplCallResize() { mpWindowImpl->mbCallResize = false; @@ -1328,8 +1304,6 @@ void Window::ImplCallResize() ImplCallEventListeners( VCLEVENT_WINDOW_RESIZE ); } - - void Window::ImplCallMove() { mpWindowImpl->mbCallMove = false; @@ -1372,8 +1346,6 @@ void Window::ImplCallMove() ImplCallEventListeners( VCLEVENT_WINDOW_MOVE ); } - - static OString ImplAutoHelpID( ResMgr* pResMgr ) { OString aRet; @@ -1384,8 +1356,6 @@ static OString ImplAutoHelpID( ResMgr* pResMgr ) return aRet; } - - WinBits Window::ImplInitRes( const ResId& rResId ) { GetRes( rResId ); @@ -1397,8 +1367,6 @@ WinBits Window::ImplInitRes( const ResId& rResId ) return nStyle; } - - WindowResHeader Window::ImplLoadResHeader( const ResId& rResId ) { WindowResHeader aHeader; @@ -1509,8 +1477,6 @@ void Window::ImplLoadRes( const ResId& rResId ) } } - - ImplWinData* Window::ImplGetWinData() const { if ( !mpWindowImpl->mpWinData ) @@ -1535,8 +1501,6 @@ ImplWinData* Window::ImplGetWinData() const return mpWindowImpl->mpWinData; } - - SalGraphics* Window::ImplGetFrameGraphics() const { if ( mpWindowImpl->mpFrameWindow->mpGraphics ) @@ -1552,8 +1516,6 @@ SalGraphics* Window::ImplGetFrameGraphics() const return mpWindowImpl->mpFrameWindow->mpGraphics; } - - Window* Window::ImplFindWindow( const Point& rFramePos ) { Window* pTempWindow; @@ -1595,8 +1557,6 @@ Window* Window::ImplFindWindow( const Point& rFramePos ) return NULL; } - - sal_uInt16 Window::ImplHitTest( const Point& rFramePos ) { Point aFramePos( rFramePos ); @@ -1624,8 +1584,6 @@ sal_uInt16 Window::ImplHitTest( const Point& rFramePos ) return nHitTest; } - - bool Window::ImplIsRealParentPath( const Window* pWindow ) const { pWindow = pWindow->GetParent(); @@ -1639,8 +1597,6 @@ bool Window::ImplIsRealParentPath( const Window* pWindow ) const return false; } - - bool Window::ImplIsChild( const Window* pWindow, bool bSystemWindow ) const { do @@ -1658,8 +1614,6 @@ bool Window::ImplIsChild( const Window* pWindow, bool bSystemWindow ) const return false; } - - bool Window::ImplIsWindowOrChild( const Window* pWindow, bool bSystemWindow ) const { if ( this == pWindow ) @@ -1667,8 +1621,6 @@ bool Window::ImplIsWindowOrChild( const Window* pWindow, bool bSystemWindow ) co return ImplIsChild( pWindow, bSystemWindow ); } - - int Window::ImplTestMousePointerSet() { // as soon as mouse is captured, switch mouse-pointer @@ -1683,8 +1635,6 @@ int Window::ImplTestMousePointerSet() return sal_False; } - - PointerStyle Window::ImplGetMousePointer() const { PointerStyle ePointerStyle; @@ -1727,8 +1677,6 @@ PointerStyle Window::ImplGetMousePointer() const return ePointerStyle; } - - void Window::ImplResetReallyVisible() { bool bBecameReallyInvisible = mpWindowImpl->mbReallyVisible; @@ -1762,8 +1710,6 @@ void Window::ImplResetReallyVisible() } } - - void Window::ImplSetReallyVisible() { // #i43594# it is possible that INITSHOW was never send, because the visibility state changed between @@ -1804,8 +1750,6 @@ void Window::ImplSetReallyVisible() } } - - void Window::ImplCallInitShow() { mpWindowImpl->mbReallyShown = true; @@ -1830,8 +1774,6 @@ void Window::ImplCallInitShow() } } - - void Window::ImplAddDel( ImplDelData* pDel ) // TODO: make "const" when incompatiblity ok { DBG_ASSERT( !pDel->mpWindow, "Window::ImplAddDel(): cannot add ImplDelData twice !" ); @@ -1843,8 +1785,6 @@ void Window::ImplAddDel( ImplDelData* pDel ) // TODO: make "const" when incompat } } - - void Window::ImplRemoveDel( ImplDelData* pDel ) // TODO: make "const" when incompatiblity ok { pDel->mpWindow = NULL; // #112873# pDel is not associated with a Window anymore @@ -1859,8 +1799,6 @@ void Window::ImplRemoveDel( ImplDelData* pDel ) // TODO: make "const" when incom } } - - void Window::ImplInitResolutionSettings() { // recalculate AppFont-resolution and DPI-resolution @@ -1896,8 +1834,6 @@ void Window::ImplInitResolutionSettings() } } - - void Window::ImplPointToLogic( Font& rFont ) const { Size aSize = rFont.GetSize(); @@ -1923,8 +1859,6 @@ void Window::ImplPointToLogic( Font& rFont ) const rFont.SetSize( aSize ); } - - void Window::ImplLogicToPoint( Font& rFont ) const { Size aSize = rFont.GetSize(); @@ -1950,8 +1884,6 @@ void Window::ImplLogicToPoint( Font& rFont ) const rFont.SetSize( aSize ); } - - bool Window::ImplSysObjClip( const Region* pOldRegion ) { bool bUpdate = true; @@ -2039,8 +1971,6 @@ bool Window::ImplSysObjClip( const Region* pOldRegion ) return bUpdate; } - - void Window::ImplUpdateSysObjChildrenClip() { if ( mpWindowImpl->mpSysObj && mpWindowImpl->mbInitWinClipRegion ) @@ -2054,8 +1984,6 @@ void Window::ImplUpdateSysObjChildrenClip() } } - - void Window::ImplUpdateSysObjOverlapsClip() { ImplUpdateSysObjChildrenClip(); @@ -2068,8 +1996,6 @@ void Window::ImplUpdateSysObjOverlapsClip() } } - - void Window::ImplUpdateSysObjClip() { if ( !ImplIsOverlapWindow() ) @@ -2091,8 +2017,6 @@ void Window::ImplUpdateSysObjClip() mpWindowImpl->mpFrameWindow->ImplUpdateSysObjOverlapsClip(); } - - bool Window::ImplSetClipFlagChildren( bool bSysObjOnlySmaller ) { bool bUpdate = true; @@ -2138,8 +2062,6 @@ bool Window::ImplSetClipFlagChildren( bool bSysObjOnlySmaller ) return bUpdate; } - - bool Window::ImplSetClipFlagOverlapWindows( bool bSysObjOnlySmaller ) { bool bUpdate = ImplSetClipFlagChildren( bSysObjOnlySmaller ); @@ -2155,8 +2077,6 @@ bool Window::ImplSetClipFlagOverlapWindows( bool bSysObjOnlySmaller ) return bUpdate; } - - bool Window::ImplSetClipFlag( bool bSysObjOnlySmaller ) { if ( !ImplIsOverlapWindow() ) @@ -2189,8 +2109,6 @@ bool Window::ImplSetClipFlag( bool bSysObjOnlySmaller ) return mpWindowImpl->mpFrameWindow->ImplSetClipFlagOverlapWindows( bSysObjOnlySmaller ); } - - void Window::ImplIntersectWindowClipRegion( Region& rRegion ) { if ( mpWindowImpl->mbInitWinClipRegion ) @@ -2199,8 +2117,6 @@ void Window::ImplIntersectWindowClipRegion( Region& rRegion ) rRegion.Intersect( mpWindowImpl->maWinClipRegion ); } - - void Window::ImplIntersectWindowRegion( Region& rRegion ) { rRegion.Intersect( Rectangle( Point( mnOutOffX, mnOutOffY ), @@ -2209,8 +2125,6 @@ void Window::ImplIntersectWindowRegion( Region& rRegion ) rRegion.Intersect( ImplPixelToDevicePixel( mpWindowImpl->maWinRegion ) ); } - - void Window::ImplExcludeWindowRegion( Region& rRegion ) { if ( mpWindowImpl->mbWinRegion ) @@ -2229,8 +2143,6 @@ void Window::ImplExcludeWindowRegion( Region& rRegion ) } } - - void Window::ImplExcludeOverlapWindows( Region& rRegion ) { Window* pWindow = mpWindowImpl->mpFirstOverlap; @@ -2246,8 +2158,6 @@ void Window::ImplExcludeOverlapWindows( Region& rRegion ) } } - - void Window::ImplExcludeOverlapWindows2( Region& rRegion ) { if ( mpWindowImpl->mbReallyVisible ) @@ -2256,8 +2166,6 @@ void Window::ImplExcludeOverlapWindows2( Region& rRegion ) ImplExcludeOverlapWindows( rRegion ); } - - void Window::ImplClipBoundaries( Region& rRegion, bool bThis, bool bOverlaps ) { if ( bThis ) @@ -2291,8 +2199,6 @@ void Window::ImplClipBoundaries( Region& rRegion, bool bThis, bool bOverlaps ) ImplGetParent()->ImplIntersectWindowClipRegion( rRegion ); } - - bool Window::ImplClipChildren( Region& rRegion ) { bool bOtherClip = false; @@ -2316,8 +2222,6 @@ bool Window::ImplClipChildren( Region& rRegion ) return bOtherClip; } - - void Window::ImplClipAllChildren( Region& rRegion ) { Window* pWindow = mpWindowImpl->mpFirstChild; @@ -2329,8 +2233,6 @@ void Window::ImplClipAllChildren( Region& rRegion ) } } - - void Window::ImplClipSiblings( Region& rRegion ) { Window* pWindow = ImplGetParent()->mpWindowImpl->mpFirstChild; @@ -2346,8 +2248,6 @@ void Window::ImplClipSiblings( Region& rRegion ) } } - - void Window::ImplInitWinClipRegion() { // Build Window Region @@ -2370,8 +2270,6 @@ void Window::ImplInitWinClipRegion() mpWindowImpl->mbInitWinClipRegion = false; } - - void Window::ImplInitWinChildClipRegion() { if ( !mpWindowImpl->mpFirstChild ) @@ -2395,8 +2293,6 @@ void Window::ImplInitWinChildClipRegion() mpWindowImpl->mbInitChildRegion = false; } - - Region* Window::ImplGetWinChildClipRegion() { if ( mpWindowImpl->mbInitWinClipRegion ) @@ -2409,8 +2305,6 @@ Region* Window::ImplGetWinChildClipRegion() return &mpWindowImpl->maWinClipRegion; } - - void Window::ImplIntersectAndUnionOverlapWindows( const Region& rInterRegion, Region& rRegion ) { Window* pWindow = mpWindowImpl->mpFirstOverlap; @@ -2428,8 +2322,6 @@ void Window::ImplIntersectAndUnionOverlapWindows( const Region& rInterRegion, Re } } - - void Window::ImplIntersectAndUnionOverlapWindows2( const Region& rInterRegion, Region& rRegion ) { if ( mpWindowImpl->mbReallyVisible ) @@ -2442,8 +2334,6 @@ void Window::ImplIntersectAndUnionOverlapWindows2( const Region& rInterRegion, R ImplIntersectAndUnionOverlapWindows( rInterRegion, rRegion ); } - - void Window::ImplCalcOverlapRegionOverlaps( const Region& rInterRegion, Region& rRegion ) { // Clip Overlap Siblings @@ -2470,8 +2360,6 @@ void Window::ImplCalcOverlapRegionOverlaps( const Region& rInterRegion, Region& ImplIntersectAndUnionOverlapWindows( rInterRegion, rRegion ); } - - void Window::ImplCalcOverlapRegion( const Rectangle& rSourceRect, Region& rRegion, bool bChildren, bool bParent, bool bSiblings ) { @@ -2542,8 +2430,6 @@ void Window::ImplCalcOverlapRegion( const Rectangle& rSourceRect, Region& rRegio } } - - void Window::ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags ) { Exception aException; @@ -2702,8 +2588,6 @@ void Window::ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags ) } } - - void Window::ImplCallOverlapPaint() { // emit overlapping windows first @@ -2724,16 +2608,12 @@ void Window::ImplCallOverlapPaint() } } - - void Window::ImplPostPaint() { if ( !ImplDoTiledRendering() && !mpWindowImpl->mpFrameData->maPaintTimer.IsActive() ) mpWindowImpl->mpFrameData->maPaintTimer.Start(); } - - IMPL_LINK_NOARG(Window, ImplHandlePaintHdl) { // save paint events until layout is done @@ -2752,8 +2632,6 @@ IMPL_LINK_NOARG(Window, ImplHandlePaintHdl) return 0; } - - IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl) { if( mpWindowImpl->mbReallyVisible ) @@ -2773,8 +2651,6 @@ IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl) return 0; } - - void Window::ImplInvalidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags ) { // set PAINTCHILDREN for all parent windows till the first OverlapWindow @@ -2832,8 +2708,6 @@ void Window::ImplInvalidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags ImplPostPaint(); } - - void Window::ImplInvalidateOverlapFrameRegion( const Region& rRegion ) { Region aRegion = rRegion; @@ -2853,8 +2727,6 @@ void Window::ImplInvalidateOverlapFrameRegion( const Region& rRegion ) } } - - void Window::ImplInvalidateParentFrameRegion( Region& rRegion ) { if ( mpWindowImpl->mbOverlapWin ) @@ -2866,8 +2738,6 @@ void Window::ImplInvalidateParentFrameRegion( Region& rRegion ) } } - - void Window::ImplInvalidate( const Region* pRegion, sal_uInt16 nFlags ) { @@ -2954,8 +2824,6 @@ void Window::ImplInvalidate( const Region* pRegion, sal_uInt16 nFlags ) pOpaqueWindow->Update(); // start painting at the opaque parent } - - void Window::ImplMoveInvalidateRegion( const Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren ) @@ -2979,8 +2847,6 @@ void Window::ImplMoveInvalidateRegion( const Rectangle& rRect, } } - - void Window::ImplMoveAllInvalidateRegions( const Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren ) @@ -3018,8 +2884,6 @@ void Window::ImplMoveAllInvalidateRegions( const Rectangle& rRect, } } - - void Window::ImplValidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags ) { if ( !pRegion ) @@ -3062,8 +2926,6 @@ void Window::ImplValidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags ) } } - - void Window::ImplValidate( const Region* pRegion, sal_uInt16 nFlags ) { // assemble region @@ -3103,8 +2965,6 @@ void Window::ImplValidate( const Region* pRegion, sal_uInt16 nFlags ) } } - - void Window::ImplScroll( const Rectangle& rRect, long nHorzScroll, long nVertScroll, sal_uInt16 nFlags ) { @@ -3284,8 +3144,6 @@ void Window::ImplScroll( const Rectangle& rRect, mpWindowImpl->mpCursor->ImplResume(); } - - void Window::ImplUpdateAll( bool bOverlapWindows ) { if ( !mpWindowImpl->mbReallyVisible ) @@ -3316,8 +3174,6 @@ void Window::ImplUpdateAll( bool bOverlapWindows ) Flush(); } - - void Window::ImplUpdateWindowPtr( Window* pWindow ) { if ( mpWindowImpl->mpFrameWindow != pWindow->mpWindowImpl->mpFrameWindow ) @@ -3343,8 +3199,6 @@ void Window::ImplUpdateWindowPtr( Window* pWindow ) } } - - void Window::ImplUpdateWindowPtr() { Window* pChild = mpWindowImpl->mpFirstChild; @@ -3355,8 +3209,6 @@ void Window::ImplUpdateWindowPtr() } } - - void Window::ImplUpdateOverlapWindowPtr( bool bNewFrame ) { bool bVisible = IsVisible(); @@ -3384,8 +3236,6 @@ void Window::ImplUpdateOverlapWindowPtr( bool bNewFrame ) Show( true ); } - - bool Window::ImplUpdatePos() { bool bSysChild = false; @@ -3417,8 +3267,6 @@ bool Window::ImplUpdatePos() return bSysChild; } - - void Window::ImplUpdateSysObjPos() { if ( mpWindowImpl->mpSysObj ) @@ -3432,7 +3280,6 @@ void Window::ImplUpdateSysObjPos() } } - void Window::ImplPosSizeWindow( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) { @@ -3737,8 +3584,6 @@ void Window::ImplPosSizeWindow( long nX, long nY, delete pOldRegion; } - - void Window::ImplToBottomChild() { if ( !ImplIsOverlapWindow() && !mpWindowImpl->mbReallyVisible && (mpWindowImpl->mpParent->mpWindowImpl->mpLastChild != this) ) @@ -3756,8 +3601,6 @@ void Window::ImplToBottomChild() } } - - void Window::ImplCalcToTop( ImplCalcToTopData* pPrevData ) { DBG_ASSERT( ImplIsOverlapWindow(), "Window::ImplCalcToTop(): Is not a OverlapWindow" ); @@ -3785,8 +3628,6 @@ void Window::ImplCalcToTop( ImplCalcToTopData* pPrevData ) } } - - void Window::ImplToTop( sal_uInt16 nFlags ) { DBG_ASSERT( ImplIsOverlapWindow(), "Window::ImplToTop(): Is not a OverlapWindow" ); @@ -3877,8 +3718,6 @@ void Window::ImplToTop( sal_uInt16 nFlags ) } } - - void Window::ImplStartToTop( sal_uInt16 nFlags ) { ImplCalcToTopData aStartData; @@ -3932,8 +3771,6 @@ void Window::ImplStartToTop( sal_uInt16 nFlags ) } } - - void Window::ImplFocusToTop( sal_uInt16 nFlags, bool bReallyVisible ) { // do we need to fetch the focus? @@ -3961,8 +3798,6 @@ void Window::ImplFocusToTop( sal_uInt16 nFlags, bool bReallyVisible ) ImplGenerateMouseMove(); } - - void Window::ImplShowAllOverlaps() { Window* pOverlapWindow = mpWindowImpl->mpFirstOverlap; @@ -3978,8 +3813,6 @@ void Window::ImplShowAllOverlaps() } } - - void Window::ImplHideAllOverlaps() { Window* pOverlapWindow = mpWindowImpl->mpFirstOverlap; @@ -3995,8 +3828,6 @@ void Window::ImplHideAllOverlaps() } } - - void Window::ImplCallMouseMove( sal_uInt16 nMouseCode, bool bModChanged ) { if ( mpWindowImpl->mpFrameData->mbMouseIn && mpWindowImpl->mpFrameWindow->mpWindowImpl->mbReallyVisible ) @@ -4022,16 +3853,12 @@ void Window::ImplCallMouseMove( sal_uInt16 nMouseCode, bool bModChanged ) } } - - void Window::ImplGenerateMouseMove() { if ( !mpWindowImpl->mpFrameData->mnMouseMoveId ) Application::PostUserEvent( mpWindowImpl->mpFrameData->mnMouseMoveId, LINK( mpWindowImpl->mpFrameWindow, Window, ImplGenerateMouseMoveHdl ) ); } - - IMPL_LINK_NOARG(Window, ImplGenerateMouseMoveHdl) { mpWindowImpl->mpFrameData->mnMouseMoveId = 0; @@ -4045,15 +3872,11 @@ IMPL_LINK_NOARG(Window, ImplGenerateMouseMoveHdl) return 0; } - - void Window::ImplInvertFocus( const Rectangle& rRect ) { InvertTracking( rRect, SHOWTRACK_SMALL | SHOWTRACK_WINDOW ); } - - void Window::ImplCallFocusChangeActivate( Window* pNewOverlapWindow, Window* pOldOverlapWindow ) { @@ -4145,7 +3968,6 @@ static bool IsWindowFocused(const WindowImpl& rWinImpl) return false; } - void Window::ImplGrabFocus( sal_uInt16 nFlags ) { // #143570# no focus for destructing windows @@ -4234,7 +4056,6 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags ) pParent = pParent->mpWindowImpl->mpParent; } - if ( ( pSVData->maWinData.mpFocusWin != this && ! mpWindowImpl->mbInDtor ) || ( bAsyncFocusWaiting && !bHasFocus && !bMustNotGrabFocus ) ) { // EndExtTextInput if it is not the same window @@ -4364,8 +4185,6 @@ void Window::ImplGrabFocusToDocument( sal_uInt16 nFlags ) } } - - void Window::ImplNewInputContext() { ImplSVData* pSVData = ImplGetSVData(); @@ -4411,15 +4230,11 @@ void Window::ImplNewInputContext() pFocusWin->mpFontCache->Release( pFontEntry ); } - - Window::Window( WindowType nType ) { ImplInitWindowData( nType ); } - - Window::Window( Window* pParent, WinBits nStyle ) { @@ -4427,8 +4242,6 @@ Window::Window( Window* pParent, WinBits nStyle ) ImplInit( pParent, nStyle, NULL ); } - - Window::Window( Window* pParent, const ResId& rResId ) : mpWindowImpl(NULL) { @@ -4442,7 +4255,6 @@ Window::Window( Window* pParent, const ResId& rResId ) Show(); } - #if OSL_DEBUG_LEVEL > 0 namespace { @@ -4466,14 +4278,12 @@ namespace } #endif - Window::~Window() { vcl::LazyDeletor<Window>::Undelete( this ); DBG_ASSERT( !mpWindowImpl->mbInDtor, "~Window - already in DTOR!" ); - // remove Key and Mouse events issued by Application::PostKey/MouseEvent Application::RemoveMouseAndKeyEvents( this ); @@ -4500,7 +4310,6 @@ Window::~Window() // remove associated data structures from dockingmanager ImplGetDockingManager()->RemoveWindow( this ); - // remove ownerdraw decorated windows from list in the top-most frame window if( (GetStyle() & WB_OWNERDRAWDECORATION) && mpWindowImpl->mbFrame ) { @@ -4797,7 +4606,6 @@ Window::~Window() } } - if ( pOverlapWindow != 0 && pOverlapWindow->mpWindowImpl->mpLastFocusWindow == this ) pOverlapWindow->mpWindowImpl->mpLastFocusWindow = NULL; @@ -4907,7 +4715,6 @@ Window::~Window() delete mpWindowImpl; mpWindowImpl = NULL; } - void Window::doLazyDelete() { SystemWindow* pSysWin = dynamic_cast<SystemWindow*>(this); @@ -4930,8 +4737,6 @@ void Window::SimulateKeyPress( sal_uInt16 nKeyCode ) const mpWindowImpl->mpFrame->SimulateKeyPress(nKeyCode); } - - void Window::MouseMove( const MouseEvent& rMEvt ) { NotifyEvent aNEvt( EVENT_MOUSEMOVE, this, &rMEvt ); @@ -4939,8 +4744,6 @@ void Window::MouseMove( const MouseEvent& rMEvt ) mpWindowImpl->mbMouseMove = true; } - - void Window::MouseButtonDown( const MouseEvent& rMEvt ) { NotifyEvent aNEvt( EVENT_MOUSEBUTTONDOWN, this, &rMEvt ); @@ -4948,8 +4751,6 @@ void Window::MouseButtonDown( const MouseEvent& rMEvt ) mpWindowImpl->mbMouseButtonDown = true; } - - void Window::MouseButtonUp( const MouseEvent& rMEvt ) { NotifyEvent aNEvt( EVENT_MOUSEBUTTONUP, this, &rMEvt ); @@ -4957,8 +4758,6 @@ void Window::MouseButtonUp( const MouseEvent& rMEvt ) mpWindowImpl->mbMouseButtonUp = true; } - - void Window::KeyInput( const KeyEvent& rKEvt ) { NotifyEvent aNEvt( EVENT_KEYINPUT, this, &rKEvt ); @@ -4966,8 +4765,6 @@ void Window::KeyInput( const KeyEvent& rKEvt ) mpWindowImpl->mbKeyInput = true; } - - void Window::KeyUp( const KeyEvent& rKEvt ) { NotifyEvent aNEvt( EVENT_KEYUP, this, &rKEvt ); @@ -4975,27 +4772,19 @@ void Window::KeyUp( const KeyEvent& rKEvt ) mpWindowImpl->mbKeyUp = true; } - - void Window::PrePaint() { } - - void Window::Paint( const Rectangle& rRect ) { ImplCallEventListeners( VCLEVENT_WINDOW_PAINT, (void*)&rRect ); } - - void Window::PostPaint() { } - - void Window::Draw( OutputDevice*, const Point&, const Size&, sal_uLong ) { } @@ -5022,16 +4811,12 @@ void Window::GetFocus() Notify( aNEvt ); } - - void Window::LoseFocus() { NotifyEvent aNEvt( EVENT_LOSEFOCUS, this ); Notify( aNEvt ); } - - void Window::RequestHelp( const HelpEvent& rHEvt ) { // if Balloon-Help is requested, show the balloon @@ -5082,8 +4867,6 @@ void Window::RequestHelp( const HelpEvent& rHEvt ) } } - - void Window::Command( const CommandEvent& rCEvt ) { ImplCallEventListeners( VCLEVENT_WINDOW_COMMAND, (void*)&rCEvt ); @@ -5093,8 +4876,6 @@ void Window::Command( const CommandEvent& rCEvt ) mpWindowImpl->mbCommand = true; } - - void Window::Tracking( const TrackingEvent& rTEvt ) { @@ -5103,14 +4884,10 @@ void Window::Tracking( const TrackingEvent& rTEvt ) pWrapper->Tracking( rTEvt ); } - - void Window::UserEvent( sal_uLong, void* ) { } - - void Window::StateChanged( StateChangedType eType ) { switch (eType) @@ -5134,14 +4911,10 @@ void Window::StateChanged( StateChangedType eType ) } } - - void Window::DataChanged( const DataChangedEvent& ) { } - - void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == EVENT_COMMAND ) @@ -5241,8 +5014,6 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt ) } } - - bool Window::PreNotify( NotifyEvent& rNEvt ) { bool bDone = false; @@ -5284,8 +5055,6 @@ bool Window::PreNotify( NotifyEvent& rNEvt ) return bDone; } - - bool Window::Notify( NotifyEvent& rNEvt ) { bool nRet = false; @@ -5393,8 +5162,6 @@ bool Window::Notify( NotifyEvent& rNEvt ) return nRet; } - - void Window::ImplCallEventListeners( sal_uLong nEvent, void* pData ) { // The implementation was moved to CallEventListeners(), @@ -5406,8 +5173,6 @@ void Window::ImplCallEventListeners( sal_uLong nEvent, void* pData ) CallEventListeners( nEvent, pData ); } - - void Window::CallEventListeners( sal_uLong nEvent, void* pData ) { VclWindowEvent aEvent( this, nEvent, pData ); @@ -5448,36 +5213,26 @@ void Window::FireVclEvent( VclSimpleEvent* pEvent ) ImplGetSVData()->mpApp->ImplCallEventListeners(pEvent); } - - void Window::AddEventListener( const Link& rEventListener ) { mpWindowImpl->maEventListeners.addListener( rEventListener ); } - - void Window::RemoveEventListener( const Link& rEventListener ) { mpWindowImpl->maEventListeners.removeListener( rEventListener ); } - - void Window::AddChildEventListener( const Link& rEventListener ) { mpWindowImpl->maChildEventListeners.addListener( rEventListener ); } - - void Window::RemoveChildEventListener( const Link& rEventListener ) { mpWindowImpl->maChildEventListeners.removeListener( rEventListener ); } - - sal_uLong Window::PostUserEvent( const Link& rLink, void* pCaller ) { sal_uLong nEventId; @@ -5485,10 +5240,6 @@ sal_uLong Window::PostUserEvent( const Link& rLink, void* pCaller ) return nEventId; } - - - - bool Window::PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller ) { @@ -5511,8 +5262,6 @@ bool Window::PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCalle } } - - void Window::RemoveUserEvent( sal_uLong nUserEvent ) { @@ -5532,8 +5281,6 @@ void Window::RemoveUserEvent( sal_uLong nUserEvent ) pSVEvent->mbCall = false; } - - bool Window::IsLocked( bool bChildren ) const { if ( mpWindowImpl->mnLockCount != 0 ) @@ -5553,8 +5300,6 @@ bool Window::IsLocked( bool bChildren ) const return false; } - - void Window::SetStyle( WinBits nStyle ) { @@ -5566,8 +5311,6 @@ void Window::SetStyle( WinBits nStyle ) } } - - void Window::SetExtendedStyle( WinBits nExtendedStyle ) { @@ -5592,8 +5335,6 @@ void Window::SetExtendedStyle( WinBits nExtendedStyle ) } } - - SystemWindow* Window::GetSystemWindow() const { @@ -5603,8 +5344,6 @@ SystemWindow* Window::GetSystemWindow() const return (SystemWindow*)pWin; } - - void Window::SetBorderStyle( sal_uInt16 nBorderStyle ) { @@ -5645,8 +5384,6 @@ void Window::SetBorderStyle( sal_uInt16 nBorderStyle ) } } - - sal_uInt16 Window::GetBorderStyle() const { @@ -5661,8 +5398,6 @@ sal_uInt16 Window::GetBorderStyle() const return 0; } - - long Window::CalcTitleWidth() const { @@ -5691,8 +5426,6 @@ long Window::CalcTitleWidth() const return 0; } - - void Window::EnableClipSiblings( bool bClipSiblings ) { @@ -5702,8 +5435,6 @@ void Window::EnableClipSiblings( bool bClipSiblings ) mpWindowImpl->mbClipSiblings = bClipSiblings; } - - void Window::SetMouseTransparent( bool bTransparent ) { @@ -5716,8 +5447,6 @@ void Window::SetMouseTransparent( bool bTransparent ) mpWindowImpl->mbMouseTransparent = bTransparent; } - - void Window::SetPaintTransparent( bool bTransparent ) { @@ -5731,8 +5460,6 @@ void Window::SetPaintTransparent( bool bTransparent ) mpWindowImpl->mbPaintTransparent = bTransparent; } - - void Window::SetInputContext( const InputContext& rInputContext ) { @@ -5741,8 +5468,6 @@ void Window::SetInputContext( const InputContext& rInputContext ) ImplNewInputContext(); } - - void Window::EndExtTextInput( sal_uInt16 nFlags ) { @@ -5750,8 +5475,6 @@ void Window::EndExtTextInput( sal_uInt16 nFlags ) ImplGetFrame()->EndExtTextInput( nFlags ); } - - void Window::SetCursorRect( const Rectangle* pRect, long nExtTextInputWidth ) { @@ -5776,8 +5499,6 @@ void Window::SetCursorRect( const Rectangle* pRect, long nExtTextInputWidth ) } - - const Rectangle* Window::GetCursorRect() const { @@ -5785,8 +5506,6 @@ const Rectangle* Window::GetCursorRect() const return pWinData->mpCursorRect; } - - long Window::GetCursorExtTextInputWidth() const { @@ -5794,8 +5513,6 @@ long Window::GetCursorExtTextInputWidth() const return pWinData->mnCursorExtWidth; } - - void Window::SetCompositionCharRect( const Rectangle* pRect, long nCompositionLength, bool bVertical ) { ImplWinData* pWinData = ImplGetWinData(); @@ -5811,7 +5528,6 @@ void Window::SetCompositionCharRect( const Rectangle* pRect, long nCompositionLe } } - void Window::SetSettings( const AllSettings& rSettings ) { SetSettings( rSettings, sal_False ); @@ -5852,8 +5568,6 @@ void Window::SetSettings( const AllSettings& rSettings, sal_Bool bChild ) } } - - void Window::UpdateSettings( const AllSettings& rSettings, bool bChild ) { @@ -5922,8 +5636,6 @@ void Window::UpdateSettings( const AllSettings& rSettings, bool bChild ) } } - - void Window::NotifyAllChildren( DataChangedEvent& rDCEvt ) { @@ -5937,8 +5649,6 @@ void Window::NotifyAllChildren( DataChangedEvent& rDCEvt ) } } - - void Window::SetPointFont( const Font& rFont ) { @@ -5947,8 +5657,6 @@ void Window::SetPointFont( const Font& rFont ) SetFont( aFont ); } - - Font Window::GetPointFont() const { @@ -5957,8 +5665,6 @@ Font Window::GetPointFont() const return aFont; } - - void Window::SetParentClipMode( sal_uInt16 nMode ) { @@ -5975,8 +5681,6 @@ void Window::SetParentClipMode( sal_uInt16 nMode ) } } - - sal_uInt16 Window::GetParentClipMode() const { @@ -5986,8 +5690,6 @@ sal_uInt16 Window::GetParentClipMode() const return mpWindowImpl->mnParentClipMode; } - - void Window::SetWindowRegionPixel() { @@ -6022,8 +5724,6 @@ void Window::SetWindowRegionPixel() } } - - void Window::SetWindowRegionPixel( const Region& rRegion ) { @@ -6110,8 +5810,6 @@ void Window::SetWindowRegionPixel( const Region& rRegion ) } } - - const Region& Window::GetWindowRegionPixel() const { @@ -6121,8 +5819,6 @@ const Region& Window::GetWindowRegionPixel() const return mpWindowImpl->maWinRegion; } - - bool Window::IsWindowRegionPixel() const { @@ -6132,8 +5828,6 @@ bool Window::IsWindowRegionPixel() const return mpWindowImpl->mbWinRegion; } - - Region Window::GetWindowClipRegionPixel( sal_uInt16 nFlags ) const { @@ -6171,8 +5865,6 @@ Region Window::GetWindowClipRegionPixel( sal_uInt16 nFlags ) const return aWinClipRegion; } - - Region Window::GetPaintRegion() const { @@ -6189,8 +5881,6 @@ Region Window::GetPaintRegion() const } } - - void Window::ExpandPaintClipRegion( const Region& rRegion ) { if( mpWindowImpl->mpPaintRegion ) @@ -6215,8 +5905,6 @@ void Window::ExpandPaintClipRegion( const Region& rRegion ) } } - - static SystemWindow *ImplGetLastSystemWindow( Window *pWin ) { // get the most top-level system window, the one that contains the taskpanelist @@ -6399,8 +6087,6 @@ void Window::SetParent( Window* pNewParent ) Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); } - - void Window::Show( bool bVisible, sal_uInt16 nFlags ) { @@ -6651,8 +6337,6 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags ) */ } - - Size Window::GetSizePixel() const { if (!mpWindowImpl) @@ -6684,9 +6368,6 @@ void Window::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, rBottomBorder = mpWindowImpl->mnBottomBorder; } - - - void Window::Enable( bool bEnable, bool bChild ) { @@ -6747,8 +6428,6 @@ void Window::Enable( bool bEnable, bool bChild ) ImplGenerateMouseMove(); } - - void Window::SetCallHandlersOnInputDisabled( bool bCall ) { mpWindowImpl->mbCallHandlersDuringInputDisabled = bCall ? sal_True : sal_False; @@ -6761,15 +6440,11 @@ void Window::SetCallHandlersOnInputDisabled( bool bCall ) } } - - bool Window::IsCallHandlersOnInputDisabled() const { return mpWindowImpl->mbCallHandlersDuringInputDisabled ? true : false; } - - void Window::EnableInput( bool bEnable, bool bChild ) { @@ -6833,8 +6508,6 @@ void Window::EnableInput( bool bEnable, bool bChild ) } } - - void Window::EnableInput( bool bEnable, bool bChild, bool bSysWin, const Window* pExcludeWindow ) { @@ -6899,8 +6572,6 @@ void Window::EnableInput( bool bEnable, bool bChild, bool bSysWin, } } - - void Window::AlwaysEnableInput( bool bAlways, bool bChild ) { @@ -6930,8 +6601,6 @@ void Window::AlwaysEnableInput( bool bAlways, bool bChild ) } } - - void Window::AlwaysDisableInput( bool bAlways, bool bChild ) { @@ -6961,8 +6630,6 @@ void Window::AlwaysDisableInput( bool bAlways, bool bChild ) } } - - void Window::SetActivateMode( sal_uInt16 nMode ) { @@ -6994,8 +6661,6 @@ void Window::SetActivateMode( sal_uInt16 nMode ) } } - - void Window::ToTop( sal_uInt16 nFlags ) { @@ -7003,8 +6668,6 @@ void Window::ToTop( sal_uInt16 nFlags ) ImplFocusToTop( nFlags, IsReallyVisible() ); } - - void Window::SetZOrder( Window* pRefWindow, sal_uInt16 nFlags ) { @@ -7178,8 +6841,6 @@ void Window::SetZOrder( Window* pRefWindow, sal_uInt16 nFlags ) } } - - void Window::EnableAlwaysOnTop( bool bEnable ) { @@ -7194,8 +6855,6 @@ void Window::EnableAlwaysOnTop( bool bEnable ) mpWindowImpl->mpFrame->SetAlwaysOnTop( bEnable ); } - - void Window::setPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) { @@ -7224,7 +6883,6 @@ void Window::setPosSizePixel( long nX, long nY, if ( !(nFlags & WINDOW_POSSIZE_HEIGHT) ) nHeight = pWindow->mnOutHeight; - sal_uInt16 nSysFlags=0; Window *pParent = GetParent(); @@ -7325,15 +6983,11 @@ void Window::setPosSizePixel( long nX, long nY, } } - - Point Window::GetPosPixel() const { return mpWindowImpl->maPos; } - - Rectangle Window::GetDesktopRectPixel() const { Rectangle rRect; @@ -7341,24 +6995,18 @@ Rectangle Window::GetDesktopRectPixel() const return rRect; } - - Point Window::OutputToScreenPixel( const Point& rPos ) const { // relative to top level parent return Point( rPos.X()+mnOutOffX, rPos.Y()+mnOutOffY ); } - - Point Window::ScreenToOutputPixel( const Point& rPos ) const { // relative to top level parent return Point( rPos.X()-mnOutOffX, rPos.Y()-mnOutOffY ); } - - long Window::ImplGetUnmirroredOutOffX() { // revert mnOutOffX changes that were potentially made in ImplPosSizeWindow @@ -7396,8 +7044,6 @@ Point Window::NormalizedScreenToOutputPixel( const Point& rPos ) const return Point( rPos.X()-offx, rPos.Y()-mnOutOffY ); } - - Point Window::OutputToAbsoluteScreenPixel( const Point& rPos ) const { // relative to the screen @@ -7408,8 +7054,6 @@ Point Window::OutputToAbsoluteScreenPixel( const Point& rPos ) const return p; } - - Point Window::AbsoluteScreenToOutputPixel( const Point& rPos ) const { // relative to the screen @@ -7420,8 +7064,6 @@ Point Window::AbsoluteScreenToOutputPixel( const Point& rPos ) const return p; } - - Rectangle Window::ImplOutputToUnmirroredAbsoluteScreenPixel( const Rectangle &rRect ) const { // this method creates unmirrored screen coordinates to be compared with the desktop @@ -7439,9 +7081,6 @@ Rectangle Window::ImplOutputToUnmirroredAbsoluteScreenPixel( const Rectangle &rR return Rectangle( p1, p2 ); } - - - Rectangle Window::GetWindowExtentsRelative( Window *pRelativeWindow ) const { // with decoration @@ -7454,8 +7093,6 @@ Rectangle Window::GetClientWindowExtentsRelative( Window *pRelativeWindow ) cons return ImplGetWindowExtentsRelative( pRelativeWindow, true ); } - - Rectangle Window::ImplGetWindowExtentsRelative( Window *pRelativeWindow, bool bClientOnly ) const { SalFrameGeometry g = mpWindowImpl->mpFrame->GetGeometry(); @@ -7484,8 +7121,6 @@ Rectangle Window::ImplGetWindowExtentsRelative( Window *pRelativeWindow, bool bC return Rectangle( aPos, aSize ); } - - void Window::Scroll( long nHorzScroll, long nVertScroll, sal_uInt16 nFlags ) { @@ -7494,8 +7129,6 @@ void Window::Scroll( long nHorzScroll, long nVertScroll, sal_uInt16 nFlags ) nHorzScroll, nVertScroll, nFlags & ~SCROLL_CLIP ); } - - void Window::Scroll( long nHorzScroll, long nVertScroll, const Rectangle& rRect, sal_uInt16 nFlags ) { @@ -7507,8 +7140,6 @@ void Window::Scroll( long nHorzScroll, long nVertScroll, ImplScroll( aRect, nHorzScroll, nVertScroll, nFlags ); } - - void Window::Invalidate( sal_uInt16 nFlags ) { @@ -7518,15 +7149,12 @@ void Window::Invalidate( sal_uInt16 nFlags ) ImplInvalidate( NULL, nFlags ); } - - void Window::Invalidate( const Rectangle& rRect, sal_uInt16 nFlags ) { if ( !IsDeviceOutputNecessary() || !mnOutWidth || !mnOutHeight ) return; - OutputDevice *pOutDev = GetOutDev(); Rectangle aRect = pOutDev->ImplLogicToDevicePixel( rRect ); if ( !aRect.IsEmpty() ) @@ -7536,8 +7164,6 @@ void Window::Invalidate( const Rectangle& rRect, sal_uInt16 nFlags ) } } - - void Window::Invalidate( const Region& rRegion, sal_uInt16 nFlags ) { @@ -7554,8 +7180,6 @@ void Window::Invalidate( const Region& rRegion, sal_uInt16 nFlags ) } } - - void Window::Validate( sal_uInt16 nFlags ) { @@ -7565,8 +7189,6 @@ void Window::Validate( sal_uInt16 nFlags ) ImplValidate( NULL, nFlags ); } - - bool Window::HasPaintEvent() const { @@ -7594,8 +7216,6 @@ bool Window::HasPaintEvent() const return false; } - - void Window::Update() { @@ -7668,8 +7288,6 @@ void Window::Update() Flush(); } - - void Window::Flush() { @@ -7677,16 +7295,12 @@ void Window::Flush() mpWindowImpl->mpFrame->Flush( aWinRect ); } - - void Window::Sync() { mpWindowImpl->mpFrame->Sync(); } - - void Window::SetUpdateMode( bool bUpdate ) { @@ -7694,16 +7308,12 @@ void Window::SetUpdateMode( bool bUpdate ) StateChanged( STATE_CHANGE_UPDATEMODE ); } - - void Window::GrabFocus() { ImplGrabFocus( 0 ); } - - bool Window::HasFocus() const { @@ -7722,8 +7332,6 @@ bool Window::HasFocus() const return (this == ImplGetSVData()->maWinData.mpFocusWin); } - - void Window::GrabFocusToDocument() { ImplGrabFocusToDocument(0); @@ -7734,8 +7342,6 @@ void Window::SetFakeFocus( bool bFocus ) ImplGetWindowImpl()->mbFakeFocusSet = bFocus; } - - bool Window::HasChildPathFocus( bool bSystemWindow ) const { @@ -7754,8 +7360,6 @@ bool Window::HasChildPathFocus( bool bSystemWindow ) const return false; } - - void Window::CaptureMouse() { @@ -7775,8 +7379,6 @@ void Window::CaptureMouse() } } - - void Window::ReleaseMouse() { @@ -7793,16 +7395,12 @@ void Window::ReleaseMouse() } } - - bool Window::IsMouseCaptured() const { return (this == ImplGetSVData()->maWinData.mpCaptureWin); } - - void Window::SetPointer( const Pointer& rPointer ) { @@ -7816,8 +7414,6 @@ void Window::SetPointer( const Pointer& rPointer ) mpWindowImpl->mpFrame->SetPointer( ImplGetMousePointer() ); } - - void Window::EnableChildPointerOverwrite( bool bOverwrite ) { @@ -7831,8 +7427,6 @@ void Window::EnableChildPointerOverwrite( bool bOverwrite ) mpWindowImpl->mpFrame->SetPointer( ImplGetMousePointer() ); } - - void Window::SetPointerPosPixel( const Point& rPos ) { Point aPos = ImplOutputToFrame( rPos ); @@ -7854,8 +7448,6 @@ void Window::SetPointerPosPixel( const Point& rPos ) mpWindowImpl->mpFrame->SetPointerPos( aPos.X(), aPos.Y() ); } - - Point Window::GetPointerPosPixel() { @@ -7869,8 +7461,6 @@ Point Window::GetPointerPosPixel() return ImplFrameToOutput( aPos ); } - - Point Window::GetLastPointerPosPixel() { @@ -7884,8 +7474,6 @@ Point Window::GetLastPointerPosPixel() return ImplFrameToOutput( aPos ); } - - void Window::ShowPointer( bool bVisible ) { @@ -7899,8 +7487,6 @@ void Window::ShowPointer( bool bVisible ) } } - - Window::PointerState Window::GetPointerState() { PointerState aState; @@ -7923,15 +7509,11 @@ Window::PointerState Window::GetPointerState() return aState; } - - bool Window::IsMouseOver() { return ImplGetWinData()->mbMouseOver; } - - void Window::EnterWait() { @@ -7945,8 +7527,6 @@ void Window::EnterWait() } } - - void Window::LeaveWait() { @@ -7963,8 +7543,6 @@ void Window::LeaveWait() } } - - void Window::SetCursor( Cursor* pCursor ) { @@ -7978,14 +7556,11 @@ void Window::SetCursor( Cursor* pCursor ) } } - - void Window::SetText( const OUString& rStr ) { if (rStr == mpWindowImpl->maText) return; - OUString oldTitle( mpWindowImpl->maText ); mpWindowImpl->maText = rStr; @@ -8010,24 +7585,18 @@ void Window::SetText( const OUString& rStr ) StateChanged( STATE_CHANGE_TEXT ); } - - OUString Window::GetText() const { return mpWindowImpl->maText; } - - OUString Window::GetDisplayText() const { return GetText(); } - - const Wallpaper& Window::GetDisplayBackground() const { // FIXME: fix issue 52349, need to fix this really in @@ -8054,8 +7623,6 @@ const Wallpaper& Window::GetDisplayBackground() const return rBack; } - - const OUString& Window::GetHelpText() const { @@ -8091,8 +7658,6 @@ const OUString& Window::GetHelpText() const return mpWindowImpl->maHelpText; } - - Window* Window::FindWindow( const Point& rPos ) const { @@ -8100,8 +7665,6 @@ Window* Window::FindWindow( const Point& rPos ) const return ((Window*)this)->ImplFindWindow( aPos ); } - - sal_uInt16 Window::GetChildCount() const { @@ -8116,8 +7679,6 @@ sal_uInt16 Window::GetChildCount() const return nChildCount; } - - Window* Window::GetChild( sal_uInt16 nChild ) const { @@ -8134,8 +7695,6 @@ Window* Window::GetChild( sal_uInt16 nChild ) const return NULL; } - - Window* Window::GetWindow( sal_uInt16 nType ) const { @@ -8225,8 +7784,6 @@ Window* Window::GetWindow( sal_uInt16 nType ) const return NULL; } - - bool Window::IsChild( const Window* pWindow, bool bSystemWindow ) const { @@ -8245,8 +7802,6 @@ bool Window::IsChild( const Window* pWindow, bool bSystemWindow ) const return false; } - - bool Window::IsWindowOrChild( const Window* pWindow, bool bSystemWindow ) const { @@ -8255,8 +7810,6 @@ bool Window::IsWindowOrChild( const Window* pWindow, bool bSystemWindow ) const return ImplIsChild( pWindow, bSystemWindow ); } - - const SystemEnvData* Window::GetSystemData() const { @@ -8275,8 +7828,6 @@ const SystemEnvData* Window::GetSystemData() const return aRet; } - - void Window::SetWindowPeer( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xPeer, VCLXWindow* pVCLXWindow ) { // be safe against re-entrance: first clear the old ref, then assign the new one @@ -8287,8 +7838,6 @@ void Window::SetWindowPeer( ::com::sun::star::uno::Reference< ::com::sun::star:: mpWindowImpl->mpVCLXWindow = pVCLXWindow; } - - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > Window::GetComponentInterface( sal_Bool bCreate ) { if ( !mpWindowImpl->mxWindowPeer.is() && bCreate ) @@ -8300,8 +7849,6 @@ void Window::SetWindowPeer( ::com::sun::star::uno::Reference< ::com::sun::star:: return mpWindowImpl->mxWindowPeer; } - - void Window::SetComponentInterface( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace ) { UnoWrapperBase* pWrapper = Application::GetUnoWrapper(); @@ -8310,8 +7857,6 @@ void Window::SetComponentInterface( ::com::sun::star::uno::Reference< ::com::sun pWrapper->SetWindowInterface( this, xIFace ); } - - void Window::ImplCallDeactivateListeners( Window *pNew ) { // no deactivation if the newly activated window is my child @@ -8329,8 +7874,6 @@ void Window::ImplCallDeactivateListeners( Window *pNew ) } } - - void Window::ImplCallActivateListeners( Window *pOld ) { // no activation if the old active window is my child @@ -8361,8 +7904,6 @@ void Window::ImplCallActivateListeners( Window *pOld ) } } - - bool Window::ImplStopDnd() { bool bRet = false; @@ -8377,15 +7918,11 @@ bool Window::ImplStopDnd() return bRet; } - - void Window::ImplStartDnd() { GetDropTarget(); } - - uno::Reference< XDropTarget > Window::GetDropTarget() { @@ -8444,8 +7981,6 @@ uno::Reference< XDropTarget > Window::GetDropTarget() return uno::Reference< XDropTarget > ( mpWindowImpl->mxDNDListenerContainer, UNO_QUERY ); } - - uno::Reference< XDragSource > Window::GetDragSource() { @@ -8511,15 +8046,11 @@ uno::Reference< XDragSource > Window::GetDragSource() return uno::Reference< XDragSource > (); } - - uno::Reference< XDragGestureRecognizer > Window::GetDragGestureRecognizer() { return uno::Reference< XDragGestureRecognizer > ( GetDropTarget(), UNO_QUERY ); } - - uno::Reference< XClipboard > Window::GetClipboard() { @@ -8547,8 +8078,6 @@ uno::Reference< XClipboard > Window::GetClipboard() return static_cast < XClipboard * > (0); } - - uno::Reference< XClipboard > Window::GetPrimarySelection() { @@ -8592,10 +8121,8 @@ uno::Reference< XClipboard > Window::GetPrimarySelection() return static_cast < XClipboard * > (0); } - // Accessibility - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > Window::GetAccessible( bool bCreate ) { // do not optimize hierarchy for the top level border win (ie, when there is no parent) @@ -8831,7 +8358,6 @@ Window* Window::GetAccessibleChildWindow( sal_uInt16 n ) return pChild; } - void Window::SetAccessibleRole( sal_uInt16 nRole ) { if ( !mpWindowImpl->mpAccessibleInfos ) @@ -8943,7 +8469,6 @@ sal_uInt16 Window::getDefaultAccessibleRole() const case WINDOW_WORKWINDOW: nRole = accessibility::AccessibleRole::ROOT_PANE; break; - case WINDOW_SCROLLBARBOX: nRole = accessibility::AccessibleRole::FILLER; break; case WINDOW_HELPTEXTWINDOW: nRole = accessibility::AccessibleRole::TOOL_TIP; break; @@ -9213,8 +8738,6 @@ void Window::RecordLayoutData( vcl::ControlLayoutData* pLayout, const Rectangle& mpOutDevData->mpRecordLayout = NULL; } - - void Window::DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlight, bool bChecked, bool bDrawBorder, bool bDrawExtBorderOnly ) { DrawSelectionBackground( rRect, highlight, bChecked, bDrawBorder, bDrawExtBorderOnly, 0, NULL, NULL ); @@ -9242,7 +8765,6 @@ void Window::DrawSelectionBackground( const Rectangle& rRect, const StyleSettings& rStyles = GetSettings().GetStyleSettings(); - // colors used for item highlighting Color aSelectionBorderCol( pPaintColor ? *pPaintColor : rStyles.GetHighlightColor() ); Color aSelectionFillCol( aSelectionBorderCol ); @@ -9361,7 +8883,6 @@ void Window::DrawSelectionBackground( const Rectangle& rRect, } } - if( bDark ) { DrawRect( aRect ); @@ -9393,7 +8914,6 @@ Window* Window::GetPreferredKeyInputWindow() return this; } - bool Window::IsScrollable() const { // check for scrollbars @@ -9579,7 +9099,6 @@ uno::Reference< rendering::XCanvas > Window::ImplGetCanvas( const Size& rFullscr // Feed any with operating system's window handle - // common: first any is VCL pointer to window (for VCL canvas) aArg[ 0 ] = makeAny( reinterpret_cast<sal_Int64>(this) ); @@ -9769,7 +9288,6 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP // get rid of virtual device now so they don't pile up during recursive calls delete pMaskedDevice, pMaskedDevice = NULL; - for( Window* pChild = mpWindowImpl->mpFirstChild; pChild; pChild = pChild->mpWindowImpl->mpNext ) { if( pChild->mpWindowImpl->mpFrame == mpWindowImpl->mpFrame && pChild->IsVisible() ) diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 73fe6749c3a1..6b5b558a04b2 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <limits.h> #include <tools/debug.hxx> #include <tools/poly.hxx> @@ -48,20 +47,14 @@ using namespace com::sun::star; - - #define IMPL_MAXSAVEBACKSIZE (640*480) #define IMPL_MAXALLSAVEBACKSIZE (800*600*2) - - struct ImplFocusDelData : public ImplDelData { Window* mpFocusWin; }; - - bool Window::ImplIsWindowInFront( const Window* pTestWindow ) const { // check for overlapping window @@ -148,8 +141,6 @@ bool Window::ImplIsWindowInFront( const Window* pTestWindow ) const return false; } - - void Window::ImplSaveOverlapBackground() { DBG_ASSERT( !mpWindowImpl->mpOverlapData->mpSaveBackDev, "Window::ImplSaveOverlapBackground() - Background already saved" ); @@ -191,8 +182,6 @@ void Window::ImplSaveOverlapBackground() } } - - bool Window::ImplRestoreOverlapBackground( Region& rInvRegion ) { if ( mpWindowImpl->mpOverlapData->mpSaveBackDev ) @@ -232,8 +221,6 @@ bool Window::ImplRestoreOverlapBackground( Region& rInvRegion ) return false; } - - void Window::ImplDeleteOverlapBackground() { if ( mpWindowImpl->mpOverlapData->mpSaveBackDev ) @@ -261,8 +248,6 @@ void Window::ImplDeleteOverlapBackground() } } - - void Window::ImplInvalidateAllOverlapBackgrounds() { Window* pWindow = mpWindowImpl->mpFrameData->mpFirstBackWin; @@ -294,8 +279,6 @@ void Window::ImplInvalidateAllOverlapBackgrounds() } } - - void Window::ShowFocus( const Rectangle& rRect ) { if( mpWindowImpl->mbInShowFocus ) @@ -341,8 +324,6 @@ void Window::ShowFocus( const Rectangle& rRect ) mpWindowImpl->mbInShowFocus = false; } - - void Window::HideFocus() { @@ -376,8 +357,6 @@ void Window::HideFocus() mpWindowImpl->mbInHideFocus = false; } - - void Window::Invert( const Rectangle& rRect, sal_uInt16 nFlags ) { if ( !IsDeviceOutputNecessary() ) @@ -411,8 +390,6 @@ void Window::Invert( const Rectangle& rRect, sal_uInt16 nFlags ) mpGraphics->Invert( aRect.Left(), aRect.Top(), aRect.GetWidth(), aRect.GetHeight(), nSalFlags, this ); } - - void Window::Invert( const Polygon& rPoly, sal_uInt16 nFlags ) { if ( !IsDeviceOutputNecessary() ) @@ -448,8 +425,6 @@ void Window::Invert( const Polygon& rPoly, sal_uInt16 nFlags ) mpGraphics->Invert( nPoints, pPtAry, nSalFlags, this ); } - - void Window::ShowTracking( const Rectangle& rRect, sal_uInt16 nFlags ) { ImplWinData* pWinData = ImplGetWinData(); @@ -476,8 +451,6 @@ void Window::ShowTracking( const Rectangle& rRect, sal_uInt16 nFlags ) mpWindowImpl->mbTrackVisible = true; } - - void Window::HideTracking() { if ( mpWindowImpl->mbTrackVisible ) @@ -489,8 +462,6 @@ void Window::HideTracking() } } - - void Window::InvertTracking( const Rectangle& rRect, sal_uInt16 nFlags ) { OutputDevice *pOutDev = GetOutDev(); @@ -553,8 +524,6 @@ void Window::InvertTracking( const Rectangle& rRect, sal_uInt16 nFlags ) } } - - void Window::InvertTracking( const Polygon& rPoly, sal_uInt16 nFlags ) { sal_uInt16 nPoints = rPoly.GetSize(); @@ -606,8 +575,6 @@ void Window::InvertTracking( const Polygon& rPoly, sal_uInt16 nFlags ) pGraphics->Invert( nPoints, pPtAry, SAL_INVERT_TRACKFRAME, this ); } - - IMPL_LINK( Window, ImplTrackTimerHdl, Timer*, pTimer ) { ImplSVData* pSVData = ImplGetSVData(); @@ -633,8 +600,6 @@ IMPL_LINK( Window, ImplTrackTimerHdl, Timer*, pTimer ) return 0; } - - void Window::StartTracking( sal_uInt16 nFlags ) { ImplSVData* pSVData = ImplGetSVData(); @@ -662,8 +627,6 @@ void Window::StartTracking( sal_uInt16 nFlags ) CaptureMouse(); } - - void Window::EndTracking( sal_uInt16 nFlags ) { ImplSVData* pSVData = ImplGetSVData(); @@ -705,15 +668,11 @@ void Window::EndTracking( sal_uInt16 nFlags ) } } - - bool Window::IsTracking() const { return (ImplGetSVData()->maWinData.mpTrackWin == this); } - - void Window::StartAutoScroll( sal_uInt16 nFlags ) { ImplSVData* pSVData = ImplGetSVData(); @@ -729,8 +688,6 @@ void Window::StartAutoScroll( sal_uInt16 nFlags ) pSVData->maAppData.mpWheelWindow = new ImplWheelWindow( this ); } - - void Window::EndAutoScroll() { ImplSVData* pSVData = ImplGetSVData(); @@ -745,8 +702,6 @@ void Window::EndAutoScroll() } } - - void Window::SaveBackground( const Point& rPos, const Size& rSize, const Point& rDestOff, VirtualDevice& rSaveDevice ) { @@ -779,8 +734,6 @@ void Window::SaveBackground( const Point& rPos, const Size& rSize, rSaveDevice.DrawOutDev( rDestOff, rSize, rPos, rSize, *this ); } - - sal_uIntPtr Window::SaveFocus() { ImplSVData* pSVData = ImplGetSVData(); @@ -795,8 +748,6 @@ sal_uIntPtr Window::SaveFocus() return 0; } - - bool Window::EndSaveFocus( sal_uIntPtr nSaveId, bool bRestore ) { if ( !nSaveId ) @@ -818,8 +769,6 @@ bool Window::EndSaveFocus( sal_uIntPtr nSaveId, bool bRestore ) } } - - void Window::SetZoom( const Fraction& rZoom ) { if ( mpWindowImpl->maZoom != rZoom ) @@ -829,15 +778,11 @@ void Window::SetZoom( const Fraction& rZoom ) } } - - inline long WinFloatRound( double fVal ) { return( fVal > 0.0 ? (long) ( fVal + 0.5 ) : -(long) ( -fVal + 0.5 ) ); } - - void Window::SetZoomedPointFont( const Font& rFont ) { const Fraction& rZoom = GetZoom(); @@ -876,8 +821,6 @@ void Window::SetZoomedPointFont( const Font& rFont ) SetPointFont( rFont ); } - - long Window::CalcZoom( long nCalc ) const { @@ -892,8 +835,6 @@ long Window::CalcZoom( long nCalc ) const return nCalc; } - - void Window::SetControlFont() { if ( mpWindowImpl->mpControlFont ) @@ -904,8 +845,6 @@ void Window::SetControlFont() } } - - void Window::SetControlFont( const Font& rFont ) { if ( rFont == Font() ) @@ -926,8 +865,6 @@ void Window::SetControlFont( const Font& rFont ) StateChanged( STATE_CHANGE_CONTROLFONT ); } - - Font Window::GetControlFont() const { if ( mpWindowImpl->mpControlFont ) @@ -939,8 +876,6 @@ Font Window::GetControlFont() const } } - - void Window::SetControlForeground() { if ( mpWindowImpl->mbControlForeground ) @@ -951,8 +886,6 @@ void Window::SetControlForeground() } } - - void Window::SetControlForeground( const Color& rColor ) { if ( rColor.GetTransparency() ) @@ -975,8 +908,6 @@ void Window::SetControlForeground( const Color& rColor ) } } - - void Window::SetControlBackground() { if ( mpWindowImpl->mbControlBackground ) @@ -987,8 +918,6 @@ void Window::SetControlBackground() } } - - void Window::SetControlBackground( const Color& rColor ) { if ( rColor.GetTransparency() ) @@ -1011,8 +940,6 @@ void Window::SetControlBackground( const Color& rColor ) } } - - Size Window::CalcWindowSize( const Size& rOutSz ) const { Size aSz = rOutSz; @@ -1021,8 +948,6 @@ Size Window::CalcWindowSize( const Size& rOutSz ) const return aSz; } - - Size Window::CalcOutputSize( const Size& rWinSz ) const { Size aSz = rWinSz; @@ -1031,8 +956,6 @@ Size Window::CalcOutputSize( const Size& rWinSz ) const return aSz; } - - Font Window::GetDrawPixelFont( OutputDevice* pDev ) const { Font aFont = GetPointFont(); @@ -1043,8 +966,6 @@ Font Window::GetDrawPixelFont( OutputDevice* pDev ) const return aFont; } - - long Window::GetDrawPixel( OutputDevice* pDev, long nPixels ) const { long nP = nPixels; @@ -1059,8 +980,6 @@ long Window::GetDrawPixel( OutputDevice* pDev, long nPixels ) const return nP; } - - static void lcl_HandleScrollHelper( ScrollBar* pScrl, long nN, bool isMultiplyByLineSize ) { if ( pScrl && nN && pScrl->IsEnabled() && pScrl->IsInputEnabled() && ! pScrl->IsInModalMode() ) @@ -1251,10 +1170,6 @@ bool Window::HandleScrollCommand( const CommandEvent& rCmd, return bRet; } - - - - // Note that when called for COMMAND_WHEEL above, despite its name, // pVScrl isn't necessarily the vertical scroll bar. Depending on // whether the scroll is horizontal or vertical, it is either the @@ -1282,7 +1197,6 @@ void Window::EnableDocking( bool bEnable ) ImplGetDockingManager()->RemoveWindow( this ); } - // retrieves the list of owner draw decorated windows for this window hiearchy ::std::vector<Window *>& Window::ImplGetOwnerDrawList() { @@ -1879,7 +1793,6 @@ bool Window::set_font_attribute(const OString &rKey, const OString &rValue) return true; } - bool Window::set_property(const OString &rKey, const OString &rValue) { if ((rKey == "label") || (rKey == "title") || (rKey == "text") ) diff --git a/vcl/source/window/window3.cxx b/vcl/source/window/window3.cxx index 88430780f077..6774a022ad4f 100644 --- a/vcl/source/window/window3.cxx +++ b/vcl/source/window/window3.cxx @@ -17,28 +17,21 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/window.hxx" #include "vcl/waitobj.hxx" #include "vcl/button.hxx" - - WaitObject::~WaitObject() { if ( mpWindow ) mpWindow->LeaveWait(); } - - Size Window::GetOptimalSize() const { return Size(); } - - void Window::ImplAdjustNWFSizes() { switch( GetType() ) diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 17f745d291c0..8a061b5821e4 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -52,12 +52,8 @@ #include <com/sun/star/datatransfer/dnd/XDragSource.hpp> #include <com/sun/star/awt/MouseEvent.hpp> - - #define IMPL_MIN_NEEDSYSWIN 49 - - bool ImplCallPreNotify( NotifyEvent& rEvt ) { return Application::CallEventHooks( rEvt ) @@ -168,8 +164,6 @@ static bool ImplHandleMouseFloatMode( Window* pChild, const Point& rMousePos, return false; } - - static void ImplHandleMouseHelpRequest( Window* pChild, const Point& rMousePos ) { ImplSVData* pSVData = ImplGetSVData(); @@ -200,8 +194,6 @@ static void ImplHandleMouseHelpRequest( Window* pChild, const Point& rMousePos ) } } - - static void ImplSetMousePointer( Window* pChild ) { ImplSVData* pSVData = ImplGetSVData(); @@ -211,8 +203,6 @@ static void ImplSetMousePointer( Window* pChild ) pChild->ImplGetFrame()->SetPointer( pChild->ImplGetMousePointer() ); } - - static bool ImplCallCommand( Window* pChild, sal_uInt16 nEvt, void* pData = NULL, bool bMouse = false, Point* pPos = NULL ) { @@ -254,8 +244,6 @@ static bool ImplCallCommand( Window* pChild, sal_uInt16 nEvt, void* pData = NULL return false; } - - /* #i34277# delayed context menu activation; * necessary if there already was a popup menu running. */ @@ -767,7 +755,6 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav if ( aDelData.IsDead() ) return true; - if ( nSVEvent == EVENT_MOUSEMOVE ) pChild->ImplGetWindowImpl()->mpFrameData->mbInMouseMove = false; @@ -850,8 +837,6 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav return bRet; } - - static Window* ImplGetKeyInputWindow( Window* pWindow ) { ImplSVData* pSVData = ImplGetSVData(); @@ -893,8 +878,6 @@ static Window* ImplGetKeyInputWindow( Window* pWindow ) return pChild; } - - static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent, sal_uInt16 nKeyCode, sal_uInt16 nCharCode, sal_uInt16 nRepeat, bool bForward ) { @@ -1183,8 +1166,6 @@ static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent, return nRet; } - - static bool ImplHandleExtTextInput( Window* pWindow, const OUString& rText, const sal_uInt16* pTextAttr, @@ -1278,8 +1259,6 @@ static bool ImplHandleExtTextInput( Window* pWindow, return !ImplCallCommand( pChild, COMMAND_EXTTEXTINPUT, &aData ); } - - static bool ImplHandleEndExtTextInput( Window* /* pWindow */ ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1307,8 +1286,6 @@ static bool ImplHandleEndExtTextInput( Window* /* pWindow */ ) return nRet; } - - static void ImplHandleExtTextInputPos( Window* pWindow, Rectangle& rRect, long& rInputWidth, bool * pVertical ) @@ -1355,8 +1332,6 @@ static void ImplHandleExtTextInputPos( Window* pWindow, = pChild != 0 && pChild->GetInputContext().GetFont().IsVertical(); } - - static bool ImplHandleInputContextChange( Window* pWindow, LanguageType eNewLang ) { Window* pChild = ImplGetKeyInputWindow( pWindow ); @@ -1364,8 +1339,6 @@ static bool ImplHandleInputContextChange( Window* pWindow, LanguageType eNewLang return !ImplCallCommand( pChild, COMMAND_INPUTCONTEXTCHANGE, &aData ); } - - static bool ImplCallWheelCommand( Window* pWindow, const Point& rPos, const CommandWheelData* pWheelData ) { @@ -1388,8 +1361,6 @@ static bool ImplCallWheelCommand( Window* pWindow, const Point& rPos, return false; } - - static bool ImplHandleWheelEvent( Window* pWindow, const SalWheelMouseEvent& rEvt, bool scaleDirectly = false ) { ImplDelData aDogTag( pWindow ); @@ -1495,7 +1466,6 @@ static bool ImplHandleWheelEvent( Window* pWindow, const SalWheelMouseEvent& rEv return !bRet; } - #define IMPL_PAINT_CHECKRTL ((sal_uInt16)0x0020) static void ImplHandlePaint( Window* pWindow, const Rectangle& rBoundRect, bool bImmediateUpdate ) @@ -1528,8 +1498,6 @@ static void ImplHandlePaint( Window* pWindow, const Rectangle& rBoundRect, bool } } - - static void KillOwnPopups( Window* pWindow ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1542,8 +1510,6 @@ static void KillOwnPopups( Window* pWindow ) } } - - void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight ) { if( pWindow->GetStyle() & (WB_MOVEABLE|WB_SIZEABLE) ) @@ -1611,8 +1577,6 @@ void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight ) pWindow->ImplGetWindowImpl()->mpFrameData->mbMinimized = bMinimized; } - - static void ImplHandleMove( Window* pWindow ) { if( pWindow->ImplGetWindowImpl()->mbFrame && pWindow->ImplIsFloatingWindow() && pWindow->IsReallyVisible() ) @@ -1638,16 +1602,12 @@ static void ImplHandleMove( Window* pWindow ) } - - static void ImplHandleMoveResize( Window* pWindow, long nNewWidth, long nNewHeight ) { ImplHandleMove( pWindow ); ImplHandleResize( pWindow, nNewWidth, nNewHeight ); } - - static void ImplActivateFloatingWindows( Window* pWindow, bool bActive ) { // First check all overlapping windows @@ -1666,9 +1626,6 @@ static void ImplActivateFloatingWindows( Window* pWindow, bool bActive ) } } - - - IMPL_LINK_NOARG(Window, ImplAsyncFocusHdl) { ImplGetWindowImpl()->mpFrameData->mnFocusId = 0; @@ -1777,13 +1734,10 @@ IMPL_LINK_NOARG(Window, ImplAsyncFocusHdl) return 0; } - - static void ImplHandleGetFocus( Window* pWindow ) { pWindow->ImplGetWindowImpl()->mpFrameData->mbHasFocus = true; - // execute Focus-Events after a delay, such that SystemChildWindows // do not blink when they receive focus if ( !pWindow->ImplGetWindowImpl()->mpFrameData->mnFocusId ) @@ -1796,8 +1750,6 @@ static void ImplHandleGetFocus( Window* pWindow ) } } - - static void ImplHandleLoseFocus( Window* pWindow ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1836,7 +1788,6 @@ static void ImplHandleLoseFocus( Window* pWindow ) pFocusWin->ImplGetWindowImpl()->mpCursor->ImplHide( true ); } - struct DelayedCloseEvent { Window* pWindow; @@ -1916,8 +1867,6 @@ void ImplHandleClose( Window* pWindow ) } } - - static void ImplHandleUserEvent( ImplSVEvent* pSVEvent ) { if ( pSVEvent ) @@ -1946,8 +1895,6 @@ static void ImplHandleUserEvent( ImplSVEvent* pSVEvent ) } } - - static sal_uInt16 ImplGetMouseMoveMode( SalMouseEvent* pEvent ) { sal_uInt16 nMode = 0; @@ -1960,8 +1907,6 @@ static sal_uInt16 ImplGetMouseMoveMode( SalMouseEvent* pEvent ) return nMode; } - - static sal_uInt16 ImplGetMouseButtonMode( SalMouseEvent* pEvent ) { sal_uInt16 nMode = 0; @@ -1978,8 +1923,6 @@ static sal_uInt16 ImplGetMouseButtonMode( SalMouseEvent* pEvent ) return nMode; } - - inline bool ImplHandleSalMouseLeave( Window* pWindow, SalMouseEvent* pEvent ) { return ImplHandleMouseEvent( pWindow, EVENT_MOUSEMOVE, true, @@ -1988,8 +1931,6 @@ inline bool ImplHandleSalMouseLeave( Window* pWindow, SalMouseEvent* pEvent ) ImplGetMouseMoveMode( pEvent ) ); } - - inline bool ImplHandleSalMouseMove( Window* pWindow, SalMouseEvent* pEvent ) { return ImplHandleMouseEvent( pWindow, EVENT_MOUSEMOVE, false, @@ -1998,8 +1939,6 @@ inline bool ImplHandleSalMouseMove( Window* pWindow, SalMouseEvent* pEvent ) ImplGetMouseMoveMode( pEvent ) ); } - - inline bool ImplHandleSalMouseButtonDown( Window* pWindow, SalMouseEvent* pEvent ) { return ImplHandleMouseEvent( pWindow, EVENT_MOUSEBUTTONDOWN, false, @@ -2013,8 +1952,6 @@ inline bool ImplHandleSalMouseButtonDown( Window* pWindow, SalMouseEvent* pEvent ImplGetMouseButtonMode( pEvent ) ); } - - inline bool ImplHandleSalMouseButtonUp( Window* pWindow, SalMouseEvent* pEvent ) { return ImplHandleMouseEvent( pWindow, EVENT_MOUSEBUTTONUP, false, @@ -2028,15 +1965,11 @@ inline bool ImplHandleSalMouseButtonUp( Window* pWindow, SalMouseEvent* pEvent ) ImplGetMouseButtonMode( pEvent ) ); } - - static bool ImplHandleSalMouseActivate( Window* /*pWindow*/, SalMouseActivateEvent* /*pEvent*/ ) { return false; } - - static bool ImplHandleMenuEvent( Window* pWindow, SalMenuEvent* pEvent, sal_uInt16 nEvent ) { // Find SystemWindow and its Menubar and let it dispatch the command @@ -2078,8 +2011,6 @@ static bool ImplHandleMenuEvent( Window* pWindow, SalMenuEvent* pEvent, sal_uInt return nRet; } - - static void ImplHandleSalKeyMod( Window* pWindow, SalKeyModEvent* pEvent ) { ImplSVData* pSVData = ImplGetSVData(); @@ -2117,8 +2048,6 @@ static void ImplHandleSalKeyMod( Window* pWindow, SalKeyModEvent* pEvent ) } } - - static void ImplHandleInputLanguageChange( Window* pWindow ) { // find window @@ -2129,8 +2058,6 @@ static void ImplHandleInputLanguageChange( Window* pWindow ) ImplCallCommand( pChild, COMMAND_INPUTLANGUAGECHANGE ); } - - static void ImplHandleSalSettings( sal_uInt16 nEvent ) { Application* pApp = GetpApp(); @@ -2183,8 +2110,6 @@ static void ImplHandleSalSettings( sal_uInt16 nEvent ) } } - - static void ImplHandleSalExtTextInputPos( Window* pWindow, SalExtTextInputPosEvent* pEvt ) { Rectangle aCursorRect; @@ -2205,8 +2130,6 @@ static void ImplHandleSalExtTextInputPos( Window* pWindow, SalExtTextInputPosEve } } - - static bool ImplHandleShowDialog( Window* pWindow, int nDialogId ) { if( ! pWindow ) @@ -2222,8 +2145,6 @@ static bool ImplHandleShowDialog( Window* pWindow, int nDialogId ) return ImplCallCommand( pWindow, COMMAND_SHOWDIALOG, &aCmdData ); } - - static void ImplHandleSurroundingTextRequest( Window *pWindow, OUString& rText, Selection &rSelRange ) @@ -2245,8 +2166,6 @@ static void ImplHandleSurroundingTextRequest( Window *pWindow, } } - - static void ImplHandleSalSurroundingTextRequest( Window *pWindow, SalSurroundingTextRequestEvent *pEvt ) { @@ -2270,8 +2189,6 @@ static void ImplHandleSalSurroundingTextRequest( Window *pWindow, pEvt->mnEnd = aSelRange.Max(); } - - static void ImplHandleSurroundingTextSelectionChange( Window *pWindow, sal_uLong nStart, sal_uLong nEnd ) @@ -2284,8 +2201,6 @@ static void ImplHandleSurroundingTextSelectionChange( Window *pWindow, } } - - static void ImplHandleStartReconversion( Window *pWindow ) { Window* pChild = ImplGetKeyInputWindow( pWindow ); @@ -2293,8 +2208,6 @@ static void ImplHandleStartReconversion( Window *pWindow ) ImplCallCommand( pChild, COMMAND_PREPARERECONVERSION ); } - - static void ImplHandleSalQueryCharPosition( Window *pWindow, SalQueryCharPositionEvent *pEvt ) { @@ -2338,8 +2251,6 @@ static void ImplHandleSalQueryCharPosition( Window *pWindow, } } - - bool ImplWindowFrameProc( Window* pWindow, SalFrame* /*pFrame*/, sal_uInt16 nEvent, const void* pEvent ) { diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx index 9c2060c77a50..d1cd7f35f6e9 100644 --- a/vcl/source/window/wrkwin.cxx +++ b/vcl/source/window/wrkwin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/debug.hxx> #include <tools/rc.h> @@ -34,8 +33,6 @@ #include <brdwin.hxx> #include <window.h> - - void WorkWindow::ImplInitWorkWindowData() { mnIcon = 0; // Should be removed in the next top level update - now in SystemWindow @@ -47,8 +44,6 @@ void WorkWindow::ImplInitWorkWindowData() mbFullScreenMode = false; } - - void WorkWindow::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData ) { sal_uInt16 nFrameStyle = BORDERWINDOW_STYLE_FRAME; @@ -73,8 +68,6 @@ void WorkWindow::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pS SetActivateMode( ACTIVATE_MODE_GRABFOCUS ); } - - void WorkWindow::ImplInit( Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& aSystemWorkWindowToken ) { if( aSystemWorkWindowToken.hasValue() ) @@ -90,16 +83,12 @@ void WorkWindow::ImplInit( Window* pParent, WinBits nStyle, const ::com::sun::st ImplInit( pParent, nStyle, NULL ); } - - WorkWindow::WorkWindow( WindowType nType ) : SystemWindow( nType ) { ImplInitWorkWindowData(); } - - WorkWindow::WorkWindow( Window* pParent, WinBits nStyle ) : SystemWindow( WINDOW_WORKWINDOW ) { @@ -107,8 +96,6 @@ WorkWindow::WorkWindow( Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle, NULL ); } - - WorkWindow::WorkWindow( Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle ) : SystemWindow( WINDOW_WORKWINDOW ) { @@ -117,8 +104,6 @@ WorkWindow::WorkWindow( Window* pParent, const ::com::sun::star::uno::Any& aSyst ImplInit( pParent, nStyle, aSystemWorkWindowToken ); } - - WorkWindow::WorkWindow( SystemParentData* pParent ) : SystemWindow( WINDOW_WORKWINDOW ) { @@ -127,8 +112,6 @@ WorkWindow::WorkWindow( SystemParentData* pParent ) : ImplInit( NULL, 0, pParent ); } - - WorkWindow::~WorkWindow() { ImplSVData* pSVData = ImplGetSVData(); @@ -139,8 +122,6 @@ WorkWindow::~WorkWindow() } } - - void WorkWindow::ShowFullScreenMode( bool bFullScreenMode ) { return ShowFullScreenMode( bFullScreenMode, GetScreenNumber()); @@ -171,8 +152,6 @@ void WorkWindow::ShowFullScreenMode( bool bFullScreenMode, sal_Int32 nDisplayScr } } - - void WorkWindow::StartPresentationMode( bool bPresentation, sal_uInt16 nFlags ) { return StartPresentationMode( bPresentation, nFlags, GetScreenNumber()); @@ -222,8 +201,6 @@ void WorkWindow::StartPresentationMode( bool bPresentation, sal_uInt16 nFlags, s } } - - bool WorkWindow::IsMinimized() const { //return mpWindowImpl->mpFrameData->mbMinimized; @@ -232,8 +209,6 @@ bool WorkWindow::IsMinimized() const return (( aState.mnState & WINDOWSTATE_STATE_MINIMIZED ) != 0); } - - bool WorkWindow::SetPluginParent( SystemParentData* pParent ) { DBG_ASSERT( ! mbPresentationMode && ! mbFullScreenMode, "SetPluginParent in fullscreen or presentation mode !" ); @@ -259,7 +234,6 @@ void WorkWindow::ImplSetFrameState( sal_uLong aFrameState ) mpWindowImpl->mpFrame->SetWindowState( &aState ); } - void WorkWindow::Minimize() { ImplSetFrameState( WINDOWSTATE_STATE_MINIMIZED ); |