diff options
Diffstat (limited to 'svtools/source/misc')
32 files changed, 379 insertions, 379 deletions
diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index fea433503989..1f044cb147c1 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -228,7 +228,7 @@ sal_Bool AcceleratorExecute::execute(const css::awt::KeyEvent& aAWTKey) css::util::URL aURL; aURL.Complete = sCommand; xParser->parseStrict(aURL); - + // ask for dispatch object css::uno::Reference< css::frame::XDispatch > xDispatch = xProvider->queryDispatch(aURL, ::rtl::OUString(), 0); sal_Bool bRet = xDispatch.is(); @@ -248,16 +248,16 @@ css::awt::KeyEvent AcceleratorExecute::st_VCLKey2AWTKey(const KeyCode& aVCLKey) css::awt::KeyEvent aAWTKey; aAWTKey.Modifiers = 0; aAWTKey.KeyCode = (sal_Int16)aVCLKey.GetCode(); - + if (aVCLKey.IsShift()) - aAWTKey.Modifiers |= css::awt::KeyModifier::SHIFT; + aAWTKey.Modifiers |= css::awt::KeyModifier::SHIFT; if (aVCLKey.IsMod1()) - aAWTKey.Modifiers |= css::awt::KeyModifier::MOD1; + aAWTKey.Modifiers |= css::awt::KeyModifier::MOD1; if (aVCLKey.IsMod2()) aAWTKey.Modifiers |= css::awt::KeyModifier::MOD2; if (aVCLKey.IsMod3()) - aAWTKey.Modifiers |= css::awt::KeyModifier::MOD3; - return aAWTKey; + aAWTKey.Modifiers |= css::awt::KeyModifier::MOD3; + return aAWTKey; } //----------------------------------------------- @@ -268,7 +268,7 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey) sal_Bool bMod2 = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD2 ) == css::awt::KeyModifier::MOD2 ); sal_Bool bMod3 = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD3 ) == css::awt::KeyModifier::MOD3 ); USHORT nKey = (USHORT)aAWTKey.KeyCode; - + return KeyCode(nKey, bShift, bMod1, bMod2, bMod3); } //----------------------------------------------- @@ -281,12 +281,12 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey) { // SAFE -> ---------------------------------- ::osl::ResettableMutexGuard aLock(m_aLock); - + css::uno::Reference< css::ui::XAcceleratorConfiguration > xGlobalCfg = m_xGlobalCfg; css::uno::Reference< css::ui::XAcceleratorConfiguration > xModuleCfg = m_xModuleCfg; css::uno::Reference< css::ui::XAcceleratorConfiguration > xDocCfg = m_xDocCfg ; - - aLock.clear(); + + aLock.clear(); // <- SAFE ---------------------------------- ::rtl::OUString sCommand; @@ -320,7 +320,7 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey) } catch(const css::container::NoSuchElementException&) {} - + // fall back to functional key codes if( aKey.Modifiers == 0 ) { @@ -328,91 +328,91 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey) { case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_LINE: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToStartOfLine" ) ); - + case com::sun::star::awt::Key::DELETE_TO_END_OF_LINE: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToEndOfLine" ) ); - + case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToStartOfPara" ) ); - + case com::sun::star::awt::Key::DELETE_TO_END_OF_PARAGRAPH: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToEndOfPara" ) ); - + case com::sun::star::awt::Key::DELETE_WORD_BACKWARD: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToStartOfWord" ) ); - + case com::sun::star::awt::Key::DELETE_WORD_FORWARD: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToEndOfWord" ) ); - + case com::sun::star::awt::Key::INSERT_LINEBREAK: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertLinebreak" ) ); - + case com::sun::star::awt::Key::INSERT_PARAGRAPH: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertPara" ) ); - + case com::sun::star::awt::Key::MOVE_WORD_BACKWARD: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToPrevWord" ) ); - + case com::sun::star::awt::Key::MOVE_WORD_FORWARD: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToNextWord" ) ); - + case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToStartOfLine" ) ); - + case com::sun::star::awt::Key::MOVE_TO_END_OF_LINE: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToEndOfLine" ) ); - + case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToStartOfPara" ) ); - + case com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToEndOfPara" ) ); - + case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToStartOfDoc" ) ); - + case com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToEndOfDoc" ) ); - + case com::sun::star::awt::Key::SELECT_BACKWARD: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharLeftSel" ) ); - + case com::sun::star::awt::Key::SELECT_FORWARD: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharRightSel" ) ); - + case com::sun::star::awt::Key::SELECT_WORD_BACKWARD: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:WordLeftSel" ) ); - + case com::sun::star::awt::Key::SELECT_WORD_FORWARD: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:WordRightSel" ) ); - + case com::sun::star::awt::Key::SELECT_WORD: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SelectWord" ) ); - + case com::sun::star::awt::Key::SELECT_LINE: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "" ) ); - + case com::sun::star::awt::Key::SELECT_PARAGRAPH: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SelectText" ) ); - + case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StartOfLineSel" ) ); - + case com::sun::star::awt::Key::SELECT_TO_END_OF_LINE: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:EndOfLineSel" ) ); case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StartOfParaSel" ) ); - + case com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:EndOfParaSel" ) ); - + case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StartOfDocumentSel" ) ); - + case com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:EndOfDocumentSel" ) ); - + case com::sun::star::awt::Key::SELECT_ALL: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SelectAll" ) ); default: diff --git a/svtools/source/misc/bindablecontrolhelper.cxx b/svtools/source/misc/bindablecontrolhelper.cxx index d9a1df8f8a41..230dbe263f24 100644 --- a/svtools/source/misc/bindablecontrolhelper.cxx +++ b/svtools/source/misc/bindablecontrolhelper.cxx @@ -51,7 +51,7 @@ namespace svt //........................................................................ #ifndef C2U -#define C2U(cChar) rtl::OUString::createFromAscii(cChar) +#define C2U(cChar) rtl::OUString::createFromAscii(cChar) #endif using namespace ::com::sun::star; diff --git a/svtools/source/misc/chartprettypainter.cxx b/svtools/source/misc/chartprettypainter.cxx index 4d73588ec51c..85d51e974710 100644 --- a/svtools/source/misc/chartprettypainter.cxx +++ b/svtools/source/misc/chartprettypainter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -136,7 +136,7 @@ bool ChartPrettyPainter::DoPrettyPaintChart( uno::Reference< frame::XModel > xCh (void)e; DBG_ERROR( "Chart cannot be painted pretty!" ); } - return false; + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/cliplistener.cxx b/svtools/source/misc/cliplistener.cxx index 741e62cb64a8..5d49f808f798 100644 --- a/svtools/source/misc/cliplistener.cxx +++ b/svtools/source/misc/cliplistener.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/misc/dialogclosedlistener.cxx b/svtools/source/misc/dialogclosedlistener.cxx index a1edf0e5b859..7cc4533896b1 100644 --- a/svtools/source/misc/dialogclosedlistener.cxx +++ b/svtools/source/misc/dialogclosedlistener.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/misc/dialogcontrolling.cxx b/svtools/source/misc/dialogcontrolling.cxx index c46ebfa7f85d..907d0bc8699d 100644 --- a/svtools/source/misc/dialogcontrolling.cxx +++ b/svtools/source/misc/dialogcontrolling.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index f146a84a969e..dde707c0bd4b 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ static USHORT aWndFunc( Window *pWin, // Parent des Dialoges USHORT nFlags, - const String &rErr, // Fehlertext + const String &rErr, // Fehlertext const String &rAction) // Actiontext /* [Beschreibung] diff --git a/svtools/source/misc/ehdl.src b/svtools/source/misc/ehdl.src index 436e06b7f3c5..ec20938a9411 100644 --- a/svtools/source/misc/ehdl.src +++ b/svtools/source/misc/ehdl.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index 22c8d889bd83..23805a459aa1 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -296,7 +296,7 @@ EmbeddedObjectRef::EmbeddedObjectRef( const EmbeddedObjectRef& rObj ) EmbeddedObjectRef::~EmbeddedObjectRef() { delete mpImp->pGraphic; - if ( mpImp->pHCGraphic ) + if ( mpImp->pHCGraphic ) DELETEZ( mpImp->pHCGraphic ); Clear(); } @@ -448,7 +448,7 @@ void EmbeddedObjectRef::GetReplacement( BOOL bUpdate ) DELETEZ( mpImp->pGraphic ); mpImp->aMediaType = ::rtl::OUString(); mpImp->pGraphic = new Graphic; - if ( mpImp->pHCGraphic ) + if ( mpImp->pHCGraphic ) DELETEZ( mpImp->pHCGraphic ); mpImp->mnGraphicVersion++; } @@ -594,7 +594,7 @@ Graphic* EmbeddedObjectRef::GetHCGraphic() const if ( !pStream->GetError() ) { GraphicFilter* pGF = GraphicFilter::GetGraphicFilter(); - Graphic* pGraphic = new Graphic(); + Graphic* pGraphic = new Graphic(); if ( pGF->ImportGraphic( *pGraphic, String(), *pStream, GRFILTER_FORMAT_DONTKNOW ) == 0 ) mpImp->pHCGraphic = pGraphic; else @@ -617,7 +617,7 @@ void EmbeddedObjectRef::SetGraphicStream( const uno::Reference< io::XInputStream delete mpImp->pGraphic; mpImp->pGraphic = new Graphic(); mpImp->aMediaType = rMediaType; - if ( mpImp->pHCGraphic ) + if ( mpImp->pHCGraphic ) DELETEZ( mpImp->pHCGraphic ); mpImp->mnGraphicVersion++; @@ -628,7 +628,7 @@ void EmbeddedObjectRef::SetGraphicStream( const uno::Reference< io::XInputStream GraphicFilter* pGF = GraphicFilter::GetGraphicFilter(); pGF->ImportGraphic( *mpImp->pGraphic, String(), *pGraphicStream, GRFILTER_FORMAT_DONTKNOW ); mpImp->mnGraphicVersion++; - + if ( mpImp->pContainer ) { pGraphicStream->Seek( 0 ); @@ -650,7 +650,7 @@ void EmbeddedObjectRef::SetGraphic( const Graphic& rGraphic, const ::rtl::OUStri delete mpImp->pGraphic; mpImp->pGraphic = new Graphic( rGraphic ); mpImp->aMediaType = rMediaType; - if ( mpImp->pHCGraphic ) + if ( mpImp->pHCGraphic ) DELETEZ( mpImp->pHCGraphic ); mpImp->mnGraphicVersion++; @@ -750,8 +750,8 @@ void EmbeddedObjectRef::DrawPaintReplacement( const Rectangle &rRect, const Stri if( nHeight > 0 ) { aPt.Y() = nHeight; - Point aP = rRect.TopLeft(); - Size aBmpSize = aBmp.GetSizePixel(); + Point aP = rRect.TopLeft(); + Size aBmpSize = aBmp.GetSizePixel(); // Bitmap einpassen if( nHeight * 10 / nWidth > aBmpSize.Height() * 10 / aBmpSize.Width() ) @@ -887,7 +887,7 @@ void EmbeddedObjectRef::UpdateReplacementOnDemand() { DELETEZ( mpImp->pGraphic ); mpImp->bNeedUpdate = sal_True; - if ( mpImp->pHCGraphic ) + if ( mpImp->pHCGraphic ) DELETEZ( mpImp->pHCGraphic ); mpImp->mnGraphicVersion++; diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx index 8944bc126d18..1c0a2963951f 100644 --- a/svtools/source/misc/embedtransfer.cxx +++ b/svtools/source/misc/embedtransfer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/misc/errtxt.src b/svtools/source/misc/errtxt.src index f33896e20003..2c1f788709e8 100644 --- a/svtools/source/misc/errtxt.src +++ b/svtools/source/misc/errtxt.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/misc/helpagent.src b/svtools/source/misc/helpagent.src index 1f2eaaa291a3..1acb5d24383a 100644 --- a/svtools/source/misc/helpagent.src +++ b/svtools/source/misc/helpagent.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/misc/helpagentwindow.cxx b/svtools/source/misc/helpagentwindow.cxx index 46118ffbabfc..7aa9ebf3e427 100644 --- a/svtools/source/misc/helpagentwindow.cxx +++ b/svtools/source/misc/helpagentwindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ #include <svtools/svtools.hrc> #include <svtools/helpid.hrc> -#define WB_AGENT_STYLE 0 +#define WB_AGENT_STYLE 0 //........................................................................ namespace svt @@ -57,7 +57,7 @@ namespace svt public: CloserButton_Impl( Window* pParent, WinBits nBits ) : ImageButton( pParent, nBits ) {} - virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); }; //-------------------------------------------------------------------- @@ -123,10 +123,10 @@ namespace svt { FloatingWindow::Paint(rRect); - Size aOutputSize( GetOutputSizePixel() ); - Point aPoint=Point(); - Rectangle aOutputRect( aPoint, aOutputSize ); - Rectangle aInnerRect( aOutputRect ); + Size aOutputSize( GetOutputSizePixel() ); + Point aPoint=Point(); + Rectangle aOutputRect( aPoint, aOutputSize ); + Rectangle aInnerRect( aOutputRect ); // paint the background SetLineColor( GetSettings().GetStyleSettings().GetFaceColor() ); @@ -182,7 +182,7 @@ namespace svt } //........................................................................ -} // namespace svt +} // namespace svt //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 19148344a6f4..9442d27f6bdd 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,9 +58,9 @@ // globals ******************************************************************* -#define NO_INDEX ((USHORT)0xFFFF) -#define CONTENT_HELPER ::utl::UCBContentHelper -#define ASCII_STRING(s) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(s) ) +#define NO_INDEX ((USHORT)0xFFFF) +#define CONTENT_HELPER ::utl::UCBContentHelper +#define ASCII_STRING(s) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(s) ) struct SvtExtensionResIdMapping_Impl { diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src index 5cd0a714aa9b..fc7dc8c4ebf9 100644 --- a/svtools/source/misc/imagemgr.src +++ b/svtools/source/misc/imagemgr.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx index 47a68a5684ea..648abac134cc 100644 --- a/svtools/source/misc/imageresourceaccess.cxx +++ b/svtools/source/misc/imageresourceaccess.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -98,7 +98,7 @@ namespace svt { return m_xInput; } - + //-------------------------------------------------------------------- Reference< XOutputStream > SAL_CALL StreamSupplier::getOutputStream( ) throw (RuntimeException) { @@ -113,7 +113,7 @@ namespace svt m_xSeekable->seek( location ); } - + //-------------------------------------------------------------------- ::sal_Int64 SAL_CALL StreamSupplier::getPosition( ) throw (IOException, RuntimeException) { @@ -122,7 +122,7 @@ namespace svt return m_xSeekable->getPosition(); } - + //-------------------------------------------------------------------- ::sal_Int64 SAL_CALL StreamSupplier::getLength( ) throw (IOException, RuntimeException) { diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx index 105eb763fb7b..a7d670117a61 100644 --- a/svtools/source/misc/imap.cxx +++ b/svtools/source/misc/imap.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ DBG_NAME( ImageMap ) -#define SCALEPOINT(aPT,aFracX,aFracY) (aPT).X()=((aPT).X()*(aFracX).GetNumerator())/(aFracX).GetDenominator(); \ +#define SCALEPOINT(aPT,aFracX,aFracY) (aPT).X()=((aPT).X()*(aFracX).GetNumerator())/(aFracX).GetDenominator(); \ (aPT).Y()=((aPT).Y()*(aFracY).GetNumerator())/(aFracY).GetDenominator(); @@ -68,7 +68,7 @@ IMapObject::IMapObject() { } -IMapObject::IMapObject( const String& rURL, const String& rAltText, const String& rDesc, +IMapObject::IMapObject( const String& rURL, const String& rAltText, const String& rDesc, const String& rTarget, const String& rName, BOOL bURLActive ) : aURL( rURL ) , aAltText( rAltText ) @@ -101,8 +101,8 @@ UINT16 IMapObject::GetVersion() const void IMapObject::Write( SvStream& rOStm, const String& rBaseURL ) const { - IMapCompat* pCompat; - const rtl_TextEncoding eEncoding = gsl_getSystemTextEncoding(); + IMapCompat* pCompat; + const rtl_TextEncoding eEncoding = gsl_getSystemTextEncoding(); rOStm << GetType(); rOStm << GetVersion(); @@ -126,15 +126,15 @@ void IMapObject::Write( SvStream& rOStm, const String& rBaseURL ) const /****************************************************************************** |* -|* Binaer-Import +|* Binaer-Import |* \******************************************************************************/ void IMapObject::Read( SvStream& rIStm, const String& rBaseURL ) { - IMapCompat* pCompat; - rtl_TextEncoding nTextEncoding; - ByteString aString; + IMapCompat* pCompat; + rtl_TextEncoding nTextEncoding; + ByteString aString; // Typ und Version ueberlesen wir rIStm.SeekRel( 2 ); @@ -216,11 +216,11 @@ IMapRectangleObject::IMapRectangleObject( const Rectangle& rRect, const String& rURL, const String& rAltText, const String& rDesc, - const String& rTarget, + const String& rTarget, const String& rName, BOOL bURLActive, BOOL bPixelCoords ) : - IMapObject ( rURL, rAltText, rDesc, rTarget, rName, bURLActive ) + IMapObject ( rURL, rAltText, rDesc, rTarget, rName, bURLActive ) { ImpConstruct( rRect, bPixelCoords ); } @@ -297,7 +297,7 @@ BOOL IMapRectangleObject::IsHit( const Point& rPoint ) const Rectangle IMapRectangleObject::GetRectangle( BOOL bPixelCoords ) const { - Rectangle aNewRect; + Rectangle aNewRect; if ( bPixelCoords ) aNewRect = Application::GetDefaultDevice()->LogicToPixel( aRect, MapMode( MAP_100TH_MM ) ); @@ -316,8 +316,8 @@ Rectangle IMapRectangleObject::GetRectangle( BOOL bPixelCoords ) const void IMapRectangleObject::Scale( const Fraction& rFracX, const Fraction& rFracY ) { - Point aTL( aRect.TopLeft() ); - Point aBR( aRect.BottomRight() ); + Point aTL( aRect.TopLeft() ); + Point aBR( aRect.BottomRight() ); if ( rFracX.GetDenominator() && rFracY.GetDenominator() ) { @@ -353,7 +353,7 @@ IMapCircleObject::IMapCircleObject( const Point& rCenter, ULONG nCircleRadius, const String& rName, BOOL bURLActive, BOOL bPixelCoords ) : - IMapObject ( rURL, rAltText, rDesc, rTarget, rName, bURLActive ) + IMapObject ( rURL, rAltText, rDesc, rTarget, rName, bURLActive ) { ImpConstruct( rCenter, nCircleRadius, bPixelCoords ); } @@ -369,7 +369,7 @@ void IMapCircleObject::ImpConstruct( const Point& rCenter, ULONG nRad, BOOL bPix { if ( bPixel ) { - MapMode aMap100( MAP_100TH_MM ); + MapMode aMap100( MAP_100TH_MM ); aCenter = Application::GetDefaultDevice()->PixelToLogic( rCenter, aMap100 ); nRadius = Application::GetDefaultDevice()->PixelToLogic( Size( nRad, 0 ), aMap100 ).Width(); @@ -434,8 +434,8 @@ UINT16 IMapCircleObject::GetType() const BOOL IMapCircleObject::IsHit( const Point& rPoint ) const { - const Point aPoint( aCenter - rPoint ); - BOOL bRet = FALSE; + const Point aPoint( aCenter - rPoint ); + BOOL bRet = FALSE; if ( (ULONG) sqrt( (double) aPoint.X() * aPoint.X() + aPoint.Y() * aPoint.Y() ) <= nRadius ) @@ -547,8 +547,8 @@ IMapPolygonObject::IMapPolygonObject( const Polygon& rPoly, const String& rName, BOOL bURLActive, BOOL bPixelCoords ) : - IMapObject ( rURL, rAltText, rDesc, rTarget, rName, bURLActive ), - bEllipse ( FALSE ) + IMapObject ( rURL, rAltText, rDesc, rTarget, rName, bURLActive ), + bEllipse ( FALSE ) { ImpConstruct( rPoly, bPixelCoords ); } @@ -578,8 +578,8 @@ void IMapPolygonObject::ImpConstruct( const Polygon& rPoly, BOOL bPixel ) void IMapPolygonObject::WriteIMapObject( SvStream& rOStm ) const { rOStm << aPoly; - rOStm << bEllipse; // >= Version 2 - rOStm << aEllipse; // >= Version 2 + rOStm << bEllipse; // >= Version 2 + rOStm << aEllipse; // >= Version 2 } @@ -634,7 +634,7 @@ BOOL IMapPolygonObject::IsHit( const Point& rPoint ) const Polygon IMapPolygonObject::GetPolygon( BOOL bPixelCoords ) const { - Polygon aNewPoly; + Polygon aNewPoly; if ( bPixelCoords ) aNewPoly = Application::GetDefaultDevice()->LogicToPixel( aPoly, MapMode( MAP_100TH_MM ) ); @@ -685,8 +685,8 @@ void IMapPolygonObject::Scale( const Fraction& rFracX, const Fraction& rFracY ) if ( bEllipse ) { - Point aTL( aEllipse.TopLeft() ); - Point aBR( aEllipse.BottomRight() ); + Point aTL( aEllipse.TopLeft() ); + Point aBR( aEllipse.BottomRight() ); if ( rFracX.GetDenominator() && rFracY.GetDenominator() ) { @@ -711,10 +711,10 @@ BOOL IMapPolygonObject::IsEqual( const IMapPolygonObject& rEqObj ) if ( IMapObject::IsEqual( rEqObj ) ) { - const Polygon& rEqPoly = rEqObj.aPoly; - const USHORT nCount = aPoly.GetSize(); - const USHORT nEqCount = rEqPoly.GetSize(); - BOOL bDifferent = FALSE; + const Polygon& rEqPoly = rEqObj.aPoly; + const USHORT nCount = aPoly.GetSize(); + const USHORT nEqCount = rEqPoly.GetSize(); + BOOL bDifferent = FALSE; if ( nCount == nEqCount ) { @@ -748,7 +748,7 @@ BOOL IMapPolygonObject::IsEqual( const IMapPolygonObject& rEqObj ) \******************************************************************************/ ImageMap::ImageMap( const String& rName ) : - aName ( rName ) + aName ( rName ) { } @@ -877,9 +877,9 @@ ImageMap& ImageMap::operator=( const ImageMap& rImageMap ) BOOL ImageMap::operator==( const ImageMap& rImageMap ) { - const USHORT nCount = (USHORT) maList.Count(); - const USHORT nEqCount = rImageMap.GetIMapObjectCount(); - BOOL bRet = FALSE; + const USHORT nCount = (USHORT) maList.Count(); + const USHORT nEqCount = rImageMap.GetIMapObjectCount(); + BOOL bRet = FALSE; if ( nCount == nEqCount ) { @@ -1030,8 +1030,8 @@ IMapObject* ImageMap::GetHitIMapObject( const Size& rTotalSize, Rectangle ImageMap::GetBoundRect() const { - Rectangle aBoundRect; - ULONG nCount = maList.Count(); + Rectangle aBoundRect; + ULONG nCount = maList.Count(); for ( ULONG i = 0; i < nCount; i++ ) aBoundRect.Union( ( (IMapObject*) maList.GetObject( i ) )->GetBoundRect() ); @@ -1084,7 +1084,7 @@ void ImageMap::Scale( const Fraction& rFracX, const Fraction& rFracY ) void ImageMap::ImpWriteImageMap( SvStream& rOStm, const String& rBaseURL ) const { IMapObject* pObj; - USHORT nCount = (USHORT) maList.Count(); + USHORT nCount = (USHORT) maList.Count(); for ( USHORT i = 0; i < nCount; i++ ) { @@ -1151,12 +1151,12 @@ void ImageMap::ImpReadImageMap( SvStream& rIStm, USHORT nCount, const String& rB void ImageMap::Write( SvStream& rOStm, const String& rBaseURL ) const { - IMapCompat* pCompat; + IMapCompat* pCompat; String aImageName( GetName() ); - String aDummy; - USHORT nOldFormat = rOStm.GetNumberFormatInt(); + String aDummy; + USHORT nOldFormat = rOStm.GetNumberFormatInt(); UINT16 nCount = (UINT16) GetIMapObjectCount(); - const rtl_TextEncoding eEncoding = gsl_getSystemTextEncoding(); + const rtl_TextEncoding eEncoding = gsl_getSystemTextEncoding(); rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); @@ -1188,10 +1188,10 @@ void ImageMap::Write( SvStream& rOStm, const String& rBaseURL ) const void ImageMap::Read( SvStream& rIStm, const String& rBaseURL ) { - ByteString aString; - char cMagic[6]; - USHORT nOldFormat = rIStm.GetNumberFormatInt(); - UINT16 nCount; + ByteString aString; + char cMagic[6]; + USHORT nOldFormat = rIStm.GetNumberFormatInt(); + UINT16 nCount; rIStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); rIStm.Read( cMagic, sizeof( cMagic ) ); diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx index d1cb4ddafd72..e57991f18632 100644 --- a/svtools/source/misc/imap2.cxx +++ b/svtools/source/misc/imap2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ TYPEINIT0_AUTOFACTORY( ImageMap ); void IMapObject::AppendCERNCoords( const Point& rPoint100, ByteString& rStr ) const { - const Point aPixPt( Application::GetDefaultDevice()->LogicToPixel( rPoint100, MapMode( MAP_100TH_MM ) ) ); + const Point aPixPt( Application::GetDefaultDevice()->LogicToPixel( rPoint100, MapMode( MAP_100TH_MM ) ) ); rStr += '('; rStr += ByteString::CreateFromInt32( aPixPt.X() ); @@ -88,7 +88,7 @@ void IMapObject::AppendCERNCoords( const Point& rPoint100, ByteString& rStr ) co void IMapObject::AppendNCSACoords( const Point& rPoint100, ByteString& rStr ) const { - const Point aPixPt( Application::GetDefaultDevice()->LogicToPixel( rPoint100, MapMode( MAP_100TH_MM ) ) ); + const Point aPixPt( Application::GetDefaultDevice()->LogicToPixel( rPoint100, MapMode( MAP_100TH_MM ) ) ); rStr += ByteString::CreateFromInt32( aPixPt.X() ); rStr += ','; @@ -215,8 +215,8 @@ void IMapCircleObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) cons void IMapPolygonObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) const { - ByteString aStr( "polygon " ); - const USHORT nCount = aPoly.GetSize(); + ByteString aStr( "polygon " ); + const USHORT nCount = aPoly.GetSize(); for ( USHORT i = 0; i < nCount; i++ ) AppendCERNCoords( aPoly[ i ], aStr ); @@ -235,8 +235,8 @@ void IMapPolygonObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) co void IMapPolygonObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) const { - ByteString aStr( "poly " ); - const USHORT nCount = Min( aPoly.GetSize(), (USHORT) 100 ); + ByteString aStr( "poly " ); + const USHORT nCount = Min( aPoly.GetSize(), (USHORT) 100 ); AppendNCSAURL( aStr, rBaseURL ); @@ -280,7 +280,7 @@ void ImageMap::Write( SvStream& rOStm, ULONG nFormat, const String& rBaseURL ) c void ImageMap::ImpWriteCERN( SvStream& rOStm, const String& rBaseURL ) const { IMapObject* pObj; - USHORT nCount = (USHORT) maList.Count(); + USHORT nCount = (USHORT) maList.Count(); for ( USHORT i = 0; i < nCount; i++ ) { @@ -316,7 +316,7 @@ void ImageMap::ImpWriteCERN( SvStream& rOStm, const String& rBaseURL ) const void ImageMap::ImpWriteNCSA( SvStream& rOStm, const String& rBaseURL ) const { IMapObject* pObj; - USHORT nCount = (USHORT) maList.Count(); + USHORT nCount = (USHORT) maList.Count(); for ( USHORT i = 0; i < nCount; i++ ) { @@ -401,16 +401,16 @@ ULONG ImageMap::ImpReadCERN( SvStream& rIStm, const String& rBaseURL ) void ImageMap::ImpReadCERNLine( const ByteString& rLine, const String& rBaseURL ) { - ByteString aStr( rLine ); - ByteString aToken; + ByteString aStr( rLine ); + ByteString aToken; aStr.EraseLeadingChars( ' ' ); aStr.EraseLeadingChars( '\t' ); aStr.EraseAllChars( ';' ); aStr.ToLowerAscii(); - const char* pStr = aStr.GetBuffer(); - char cChar = *pStr++; + const char* pStr = aStr.GetBuffer(); + char cChar = *pStr++; // Anweisung finden while( ( cChar >= 'a' ) && ( cChar <= 'z' ) && NOTEOL( cChar ) ) @@ -423,18 +423,18 @@ void ImageMap::ImpReadCERNLine( const ByteString& rLine, const String& rBaseURL { if ( ( aToken == "rectangle" ) || ( aToken == "rect" ) ) { - const Point aTopLeft( ImpReadCERNCoords( &pStr ) ); - const Point aBottomRight( ImpReadCERNCoords( &pStr ) ); + const Point aTopLeft( ImpReadCERNCoords( &pStr ) ); + const Point aBottomRight( ImpReadCERNCoords( &pStr ) ); const String aURL( ImpReadCERNURL( &pStr, rBaseURL ) ); - const Rectangle aRect( aTopLeft, aBottomRight ); + const Rectangle aRect( aTopLeft, aBottomRight ); IMapRectangleObject* pObj = new IMapRectangleObject( aRect, aURL, String(), String(), String(), String() ); maList.Insert( pObj, LIST_APPEND ); } else if ( ( aToken == "circle" ) || ( aToken == "circ" ) ) { - const Point aCenter( ImpReadCERNCoords( &pStr ) ); - const long nRadius = ImpReadCERNRadius( &pStr ); + const Point aCenter( ImpReadCERNCoords( &pStr ) ); + const long nRadius = ImpReadCERNRadius( &pStr ); const String aURL( ImpReadCERNURL( &pStr, rBaseURL ) ); IMapCircleObject* pObj = new IMapCircleObject( aCenter, nRadius, aURL, String(), String(), String(), String() ); @@ -442,9 +442,9 @@ void ImageMap::ImpReadCERNLine( const ByteString& rLine, const String& rBaseURL } else if ( ( aToken == "polygon" ) || ( aToken == "poly" ) ) { - const USHORT nCount = aStr.GetTokenCount( '(' ) - 1; - Polygon aPoly( nCount ); - String aURL; + const USHORT nCount = aStr.GetTokenCount( '(' ) - 1; + Polygon aPoly( nCount ); + String aURL; for ( USHORT i = 0; i < nCount; i++ ) aPoly[ i ] = ImpReadCERNCoords( &pStr ); @@ -466,10 +466,10 @@ void ImageMap::ImpReadCERNLine( const ByteString& rLine, const String& rBaseURL Point ImageMap::ImpReadCERNCoords( const char** ppStr ) { - String aStrX; - String aStrY; - Point aPt; - char cChar = *(*ppStr)++; + String aStrX; + String aStrY; + Point aPt; + char cChar = *(*ppStr)++; while( NOTEOL( cChar ) && ( ( cChar < '0' ) || ( cChar > '9' ) ) ) cChar = *(*ppStr)++; @@ -513,8 +513,8 @@ Point ImageMap::ImpReadCERNCoords( const char** ppStr ) long ImageMap::ImpReadCERNRadius( const char** ppStr ) { - String aStr; - char cChar = *(*ppStr)++; + String aStr; + char cChar = *(*ppStr)++; while( NOTEOL( cChar ) && ( ( cChar < '0' ) || ( cChar > '9' ) ) ) cChar = *(*ppStr)++; @@ -540,7 +540,7 @@ long ImageMap::ImpReadCERNRadius( const char** ppStr ) String ImageMap::ImpReadCERNURL( const char** ppStr, const String& rBaseURL ) { - String aStr( String::CreateFromAscii( *ppStr ) ); + String aStr( String::CreateFromAscii( *ppStr ) ); aStr.EraseLeadingChars( ' ' ); aStr.EraseLeadingChars( '\t' ); @@ -579,16 +579,16 @@ ULONG ImageMap::ImpReadNCSA( SvStream& rIStm, const String& rBaseURL ) void ImageMap::ImpReadNCSALine( const ByteString& rLine, const String& rBaseURL ) { - ByteString aStr( rLine ); - ByteString aToken; + ByteString aStr( rLine ); + ByteString aToken; aStr.EraseLeadingChars( ' ' ); aStr.EraseLeadingChars( '\t' ); aStr.EraseAllChars( ';' ); aStr.ToLowerAscii(); - const char* pStr = aStr.GetBuffer(); - char cChar = *pStr++; + const char* pStr = aStr.GetBuffer(); + char cChar = *pStr++; // Anweisung finden while( ( cChar >= 'a' ) && ( cChar <= 'z' ) && NOTEOL( cChar ) ) @@ -602,9 +602,9 @@ void ImageMap::ImpReadNCSALine( const ByteString& rLine, const String& rBaseURL if ( aToken == "rect" ) { const String aURL( ImpReadNCSAURL( &pStr, rBaseURL ) ); - const Point aTopLeft( ImpReadNCSACoords( &pStr ) ); - const Point aBottomRight( ImpReadNCSACoords( &pStr ) ); - const Rectangle aRect( aTopLeft, aBottomRight ); + const Point aTopLeft( ImpReadNCSACoords( &pStr ) ); + const Point aBottomRight( ImpReadNCSACoords( &pStr ) ); + const Rectangle aRect( aTopLeft, aBottomRight ); IMapRectangleObject* pObj = new IMapRectangleObject( aRect, aURL, String(), String(), String(), String() ); maList.Insert( pObj, LIST_APPEND ); @@ -612,9 +612,9 @@ void ImageMap::ImpReadNCSALine( const ByteString& rLine, const String& rBaseURL else if ( aToken == "circle" ) { const String aURL( ImpReadNCSAURL( &pStr, rBaseURL ) ); - const Point aCenter( ImpReadNCSACoords( &pStr ) ); - const Point aDX( aCenter - ImpReadNCSACoords( &pStr ) ); - long nRadius = (long) sqrt( (double) aDX.X() * aDX.X() + + const Point aCenter( ImpReadNCSACoords( &pStr ) ); + const Point aDX( aCenter - ImpReadNCSACoords( &pStr ) ); + long nRadius = (long) sqrt( (double) aDX.X() * aDX.X() + (double) aDX.Y() * aDX.Y() ); IMapCircleObject* pObj = new IMapCircleObject( aCenter, nRadius, aURL, String(), String(), String(), String() ); @@ -622,9 +622,9 @@ void ImageMap::ImpReadNCSALine( const ByteString& rLine, const String& rBaseURL } else if ( aToken == "poly" ) { - const USHORT nCount = aStr.GetTokenCount( ',' ) - 1; + const USHORT nCount = aStr.GetTokenCount( ',' ) - 1; const String aURL( ImpReadNCSAURL( &pStr, rBaseURL ) ); - Polygon aPoly( nCount ); + Polygon aPoly( nCount ); for ( USHORT i = 0; i < nCount; i++ ) aPoly[ i ] = ImpReadNCSACoords( &pStr ); @@ -644,8 +644,8 @@ void ImageMap::ImpReadNCSALine( const ByteString& rLine, const String& rBaseURL String ImageMap::ImpReadNCSAURL( const char** ppStr, const String& rBaseURL ) { - String aStr; - char cChar = *(*ppStr)++; + String aStr; + char cChar = *(*ppStr)++; while( NOTEOL( cChar ) && ( ( cChar == ' ' ) || ( cChar == '\t' ) ) ) cChar = *(*ppStr)++; @@ -671,10 +671,10 @@ String ImageMap::ImpReadNCSAURL( const char** ppStr, const String& rBaseURL ) Point ImageMap::ImpReadNCSACoords( const char** ppStr ) { - String aStrX; - String aStrY; - Point aPt; - char cChar = *(*ppStr)++; + String aStrX; + String aStrY; + Point aPt; + char cChar = *(*ppStr)++; while( NOTEOL( cChar ) && ( ( cChar < '0' ) || ( cChar > '9' ) ) ) cChar = *(*ppStr)++; @@ -714,9 +714,9 @@ Point ImageMap::ImpReadNCSACoords( const char** ppStr ) ULONG ImageMap::ImpDetectFormat( SvStream& rIStm ) { - ULONG nPos = rIStm.Tell(); - ULONG nRet = IMAP_FORMAT_BIN; - char cMagic[6]; + ULONG nPos = rIStm.Tell(); + ULONG nRet = IMAP_FORMAT_BIN; + char cMagic[6]; rIStm.Read( cMagic, sizeof( cMagic ) ); @@ -724,8 +724,8 @@ ULONG ImageMap::ImpDetectFormat( SvStream& rIStm ) // untersuchen wir das Format if ( memcmp( cMagic, IMAPMAGIC, sizeof( cMagic ) ) ) { - ByteString aStr; - long nCount = 128; + ByteString aStr; + long nCount = 128; rIStm.Seek( nPos ); while ( rIStm.ReadLine( aStr ) && nCount-- ) diff --git a/svtools/source/misc/imap3.cxx b/svtools/source/misc/imap3.cxx index 1072121a3c5d..2d05c942a036 100644 --- a/svtools/source/misc/imap3.cxx +++ b/svtools/source/misc/imap3.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,8 +42,8 @@ \******************************************************************************/ IMapCompat::IMapCompat( SvStream& rStm, const USHORT nStreamMode ) : - pRWStm ( &rStm ), - nStmMode ( nStreamMode ) + pRWStm ( &rStm ), + nStmMode ( nStreamMode ) { DBG_ASSERT( nStreamMode == STREAM_READ || nStreamMode == STREAM_WRITE, "Wrong Mode!" ); @@ -78,7 +78,7 @@ IMapCompat::~IMapCompat() { if ( nStmMode == STREAM_WRITE ) { - const ULONG nEndPos = pRWStm->Tell(); + const ULONG nEndPos = pRWStm->Tell(); pRWStm->Seek( nCompatPos ); *pRWStm << (UINT32) ( nEndPos - nTotalSize ); diff --git a/svtools/source/misc/itemdel.cxx b/svtools/source/misc/itemdel.cxx index 184b631cec65..0de0560471eb 100644 --- a/svtools/source/misc/itemdel.cxx +++ b/svtools/source/misc/itemdel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ DBG_NAME(SfxItemDesruptor_Impl); class SfxItemDesruptor_Impl { SfxPoolItem *pItem; - Link aLink; + Link aLink; private: DECL_LINK( Delete, void * ); diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx index fe99763cf825..3e406c4c9673 100644 --- a/svtools/source/misc/langhelp.cxx +++ b/svtools/source/misc/langhelp.cxx @@ -35,7 +35,7 @@ void localizeWebserviceURI( ::rtl::OUString& rURI ) { ::rtl::OUString aLang = Application::GetSettings().GetUILocale().Language; - if ( aLang.equalsIgnoreAsciiCaseAscii( "pt" ) + if ( aLang.equalsIgnoreAsciiCaseAscii( "pt" ) && Application::GetSettings().GetUILocale().Country.equalsIgnoreAsciiCaseAscii("br") ) { aLang = ::rtl::OUString::createFromAscii("pt-br"); diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx index 1a139a2ff966..2edf816a29af 100644 --- a/svtools/source/misc/langtab.cxx +++ b/svtools/source/misc/langtab.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,24 +52,24 @@ SVT_DLLPUBLIC const String ApplyLreOrRleEmbedding( const String &rText ) const USHORT nLen = rText.Len(); if (nLen == 0) return String(); - + const sal_Unicode cLRE_Embedding = 0x202A; // the start char of an LRE embedding const sal_Unicode cRLE_Embedding = 0x202B; // the start char of an RLE embedding const sal_Unicode cPopDirectionalFormat = 0x202C; // the unicode PDF (POP_DIRECTIONAL_FORMAT) char that terminates an LRE/RLE embedding - + // check if there are alreay embedding characters at the strings start // if so change nothing const sal_Unicode cChar = rText.GetBuffer()[0]; if (cChar == cLRE_Embedding || cChar == cRLE_Embedding) return rText; - + // since we only call the function getCharacterDirection // it does not matter which locale the CharClass is for. // Thus we can readily make use of SvtSysLocale::GetCharClass() // which should come at no cost... SvtSysLocale aSysLocale; const CharClass &rCharClass = aSysLocale.GetCharClass(); - + // we should look for the first non-neutral LTR or RTL character // and use that to determine the embedding of the whole text... // Thus we can avoid to check every character of the text. @@ -87,27 +87,27 @@ SVT_DLLPUBLIC const String ApplyLreOrRleEmbedding( const String &rText ) case i18n::DirectionProperty_ARABIC_NUMBER : // yes! arabic numbers are written from left to right { bIsRtlText = false; - bFound = true; + bFound = true; break; } - + case i18n::DirectionProperty_RIGHT_TO_LEFT : case i18n::DirectionProperty_RIGHT_TO_LEFT_ARABIC : case i18n::DirectionProperty_RIGHT_TO_LEFT_EMBEDDING : case i18n::DirectionProperty_RIGHT_TO_LEFT_OVERRIDE : - { + { bIsRtlText = true; - bFound = true; + bFound = true; break; } - + default: { // nothing to be done, character is considered to be neutral we need to look further ... - } - } + } + } } - + sal_Unicode cStart = cLRE_Embedding; // default is to use LRE embedding characters if (bIsRtlText) cStart = cRLE_Embedding; // then use RLE embedding @@ -121,7 +121,7 @@ SVT_DLLPUBLIC const String ApplyLreOrRleEmbedding( const String &rText ) } return aRes; -} +} //------------------------------------------------------------------------ @@ -151,7 +151,7 @@ const String& SvtLanguageTable::GetString( const LanguageType eType ) const // generally raise an error. OSL_ENSURE( eLang == LANGUAGE_ENGLISH, "language entry not found in resource" ); - + nPos = FindIndex( LANGUAGE_DONTKNOW ); if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count() ) @@ -181,7 +181,7 @@ LanguageType SvtLanguageTable::GetType( const String& rStr ) const eType = LanguageType( GetValue( i ) ); break; } - } + } return eType; } @@ -191,7 +191,7 @@ sal_uInt32 SvtLanguageTable::GetEntryCount() const { return Count(); } - + //------------------------------------------------------------------------ LanguageType SvtLanguageTable::GetTypeAtIndex( sal_uInt32 nIndex ) const diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src index e521fbdba570..b28a57e4a39e 100644 --- a/svtools/source/misc/langtab.src +++ b/svtools/source/misc/langtab.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -186,7 +186,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE < "Swahili (Kenya)" ; LANGUAGE_SWAHILI ; > ; < "Swedish (Sweden)" ; LANGUAGE_SWEDISH ; > ; < "Swedish (Finland)" ; LANGUAGE_SWEDISH_FINLAND ; > ; - < "Tajik" ; LANGUAGE_TAJIK ; > ; + < "Tajik" ; LANGUAGE_TAJIK ; > ; < "Tamil" ; LANGUAGE_TAMIL ; > ; < "Tatar" ; LANGUAGE_TATAR ; > ; < "Telugu" ; LANGUAGE_TELUGU ; > ; diff --git a/svtools/source/misc/stringtransfer.cxx b/svtools/source/misc/stringtransfer.cxx index 0d6165abd3e2..348824449a87 100644 --- a/svtools/source/misc/stringtransfer.cxx +++ b/svtools/source/misc/stringtransfer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,7 +82,7 @@ namespace svt // check for a string format const DataFlavorExVector& rFormats = aClipboardData.GetDataFlavorExVector(); - for ( DataFlavorExVector::const_iterator aSearch = rFormats.begin(); + for ( DataFlavorExVector::const_iterator aSearch = rFormats.begin(); aSearch != rFormats.end(); ++aSearch ) @@ -108,7 +108,7 @@ namespace svt } //........................................................................ -} // namespace svt +} // namespace svt //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx index 80d766354dfc..5ad3c23ac75f 100644 --- a/svtools/source/misc/svtaccessiblefactory.cxx +++ b/svtools/source/misc/svtaccessiblefactory.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/misc/svtdata.cxx b/svtools/source/misc/svtdata.cxx index 9429ac014df9..6643659bffdd 100644 --- a/svtools/source/misc/svtdata.cxx +++ b/svtools/source/misc/svtdata.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 366037c7a1d3..39e7f0be8bdc 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,13 +97,13 @@ namespace svt //--------------------------------------------------------------------- sal_Bool operator == ( const util::DateTime& _rLHS, const util::DateTime& _rRHS ) { - return _rLHS.HundredthSeconds == _rRHS.HundredthSeconds - && _rLHS.Seconds == _rRHS.Seconds - && _rLHS.Minutes == _rRHS.Minutes - && _rLHS.Hours == _rRHS.Hours - && _rLHS.Day == _rRHS.Day - && _rLHS.Month == _rRHS.Month - && _rLHS.Year == _rRHS.Year; + return _rLHS.HundredthSeconds == _rRHS.HundredthSeconds + && _rLHS.Seconds == _rRHS.Seconds + && _rLHS.Minutes == _rRHS.Minutes + && _rLHS.Hours == _rRHS.Hours + && _rLHS.Day == _rRHS.Day + && _rLHS.Month == _rRHS.Month + && _rLHS.Year == _rRHS.Year; } //--------------------------------------------------------------------- @@ -116,7 +116,7 @@ namespace svt //= TemplateContent //===================================================================== struct TemplateContent; - typedef ::std::vector< ::rtl::Reference< TemplateContent > > TemplateFolderContent; + typedef ::std::vector< ::rtl::Reference< TemplateContent > > TemplateFolderContent; typedef TemplateFolderContent::const_iterator ConstFolderIterator; typedef TemplateFolderContent::iterator FolderIterator; @@ -127,13 +127,13 @@ namespace svt public: private: - INetURLObject m_aURL; - String m_sLocalName; // redundant - last segment of m_aURL - util::DateTime m_aLastModified; // date of last modification as reported by UCP - TemplateFolderContent m_aSubContents; // sorted (by name) list of the children + INetURLObject m_aURL; + String m_sLocalName; // redundant - last segment of m_aURL + util::DateTime m_aLastModified; // date of last modification as reported by UCP + TemplateFolderContent m_aSubContents; // sorted (by name) list of the children private: - inline void implResetDate( ) + inline void implResetDate( ) { m_aLastModified.HundredthSeconds = m_aLastModified.Seconds = m_aLastModified.Minutes = m_aLastModified.Hours = 0; m_aLastModified.Day = m_aLastModified.Month = m_aLastModified.Year = 0; @@ -148,20 +148,20 @@ namespace svt TemplateContent( const INetURLObject& _rURL, const util::DateTime& _rLastModified ); // attribute access - inline String getName( ) const { return m_sLocalName; } - inline String getURL( ) const { return m_aURL.GetMainURL( INetURLObject::DECODE_TO_IURI ); } - inline void setModDate( const util::DateTime& _rDate ) { m_aLastModified = _rDate; } - inline const util::DateTime& getModDate( ) const { return m_aLastModified; } + inline String getName( ) const { return m_sLocalName; } + inline String getURL( ) const { return m_aURL.GetMainURL( INetURLObject::DECODE_TO_IURI ); } + inline void setModDate( const util::DateTime& _rDate ) { m_aLastModified = _rDate; } + inline const util::DateTime& getModDate( ) const { return m_aLastModified; } - inline TemplateFolderContent& getSubContents() { return m_aSubContents; } - inline const TemplateFolderContent& getSubContents() const { return m_aSubContents; } + inline TemplateFolderContent& getSubContents() { return m_aSubContents; } + inline const TemplateFolderContent& getSubContents() const { return m_aSubContents; } inline ConstFolderIterator begin() const { return m_aSubContents.begin(); } inline ConstFolderIterator end() const { return m_aSubContents.end(); } inline TemplateFolderContent::size_type - size() const { return m_aSubContents.size(); } + size() const { return m_aSubContents.size(); } - inline void push_back( const ::rtl::Reference< TemplateContent >& _rxNewElement ) + inline void push_back( const ::rtl::Reference< TemplateContent >& _rxNewElement ) { m_aSubContents.push_back( _rxNewElement ); } }; @@ -207,16 +207,16 @@ namespace svt //--------------------------------------------------------------------- /// compares two TemplateContent by URL struct TemplateContentURLLess - :public ::std::binary_function < ::rtl::Reference< TemplateContent > - , ::rtl::Reference< TemplateContent > - , bool + :public ::std::binary_function < ::rtl::Reference< TemplateContent > + , ::rtl::Reference< TemplateContent > + , bool > { bool operator() ( const ::rtl::Reference< TemplateContent >& _rxLHS, const ::rtl::Reference< TemplateContent >& _rxRHS ) const { - return _rxLHS->getURL() < _rxRHS->getURL() - ? true - : false; + return _rxLHS->getURL() < _rxRHS->getURL() + ? true + : false; } }; @@ -253,9 +253,9 @@ namespace svt /** does a deep compare of two template contents */ struct TemplateContentEqual - :public ::std::binary_function < ::rtl::Reference< TemplateContent > - , ::rtl::Reference< TemplateContent > - , bool + :public ::std::binary_function < ::rtl::Reference< TemplateContent > + , ::rtl::Reference< TemplateContent > + , bool > { //................................................................. @@ -278,7 +278,7 @@ namespace svt return false; if ( _rLHS->getSubContents().size() ) - { // there are children + { // there are children // -> compare them ::std::pair< FolderIterator, FolderIterator > aFirstDifferent = ::std::mismatch( _rLHS->getSubContents().begin(), @@ -299,7 +299,7 @@ namespace svt struct StorageHelper { protected: - SvStream& m_rStorage; + SvStream& m_rStorage; StorageHelper( SvStream& _rStorage ) : m_rStorage( _rStorage ) { } }; @@ -469,46 +469,46 @@ namespace svt class TemplateFolderCacheImpl { private: - TemplateFolderContent m_aPreviousState; // the current state of the template dirs (as found on the HD) - TemplateFolderContent m_aCurrentState; // the previous state of the template dirs (as found in the cache file) + TemplateFolderContent m_aPreviousState; // the current state of the template dirs (as found on the HD) + TemplateFolderContent m_aCurrentState; // the previous state of the template dirs (as found in the cache file) osl::Mutex m_aMutex; // will be lazy inited; never access directly; use getOfficeInstDirs(). uno::Reference< util::XOfficeInstallationDirectories > m_xOfficeInstDirs; - SvStream* m_pCacheStream; - sal_Bool m_bNeedsUpdate : 1; - sal_Bool m_bKnowState : 1; - sal_Bool m_bValidCurrentState : 1; - sal_Bool m_bAutoStoreState : 1; + SvStream* m_pCacheStream; + sal_Bool m_bNeedsUpdate : 1; + sal_Bool m_bKnowState : 1; + sal_Bool m_bValidCurrentState : 1; + sal_Bool m_bAutoStoreState : 1; public: TemplateFolderCacheImpl( sal_Bool _bAutoStoreState ); ~TemplateFolderCacheImpl( ); - sal_Bool needsUpdate( sal_Bool _bForceCheck ); - void storeState( sal_Bool _bForceRetrieval ); + sal_Bool needsUpdate( sal_Bool _bForceCheck ); + void storeState( sal_Bool _bForceRetrieval ); private: - void initTemplDirs( ::std::vector< String >& _rRootDirs ); - sal_Bool openCacheStream( sal_Bool _bForRead ); - void closeCacheStream( ); + void initTemplDirs( ::std::vector< String >& _rRootDirs ); + sal_Bool openCacheStream( sal_Bool _bForRead ); + void closeCacheStream( ); /// read the state of the dirs from the cache file - sal_Bool readPreviousState(); + sal_Bool readPreviousState(); /// read the current state of the dirs - sal_Bool readCurrentState(); + sal_Bool readCurrentState(); - String implParseSmart( const String& _rPath ); + String implParseSmart( const String& _rPath ); - sal_Bool implReadFolder( const ::rtl::Reference< TemplateContent >& _rxRoot ); + sal_Bool implReadFolder( const ::rtl::Reference< TemplateContent >& _rxRoot ); - static String getCacheFileName(); - static sal_Int32 getMagicNumber(); - static void normalize( TemplateFolderContent& _rState ); + static String getCacheFileName(); + static sal_Int32 getMagicNumber(); + static void normalize( TemplateFolderContent& _rState ); // @return <TRUE/> if the states equal - static sal_Bool equalStates( const TemplateFolderContent& _rLHS, const TemplateFolderContent& _rRHS ); + static sal_Bool equalStates( const TemplateFolderContent& _rLHS, const TemplateFolderContent& _rRHS ); // late initialize m_xOfficeInstDirs uno::Reference< util::XOfficeInstallationDirectories > getOfficeInstDirs(); @@ -516,11 +516,11 @@ namespace svt //--------------------------------------------------------------------- TemplateFolderCacheImpl::TemplateFolderCacheImpl( sal_Bool _bAutoStoreState ) - :m_pCacheStream ( NULL ) - ,m_bNeedsUpdate ( sal_True ) - ,m_bKnowState ( sal_False ) - ,m_bValidCurrentState ( sal_False ) - ,m_bAutoStoreState ( _bAutoStoreState ) + :m_pCacheStream ( NULL ) + ,m_bNeedsUpdate ( sal_True ) + ,m_bKnowState ( sal_False ) + ,m_bValidCurrentState ( sal_False ) + ,m_bAutoStoreState ( _bAutoStoreState ) { } @@ -585,7 +585,7 @@ namespace svt if ( m_bValidCurrentState && openCacheStream( sal_False ) ) { - *m_pCacheStream << getMagicNumber(); + *m_pCacheStream << getMagicNumber(); // store the template root folders // the size @@ -673,16 +673,16 @@ namespace svt ::rtl::Reference< TemplateContent > xChild = new TemplateContent( aSubContentURL ); // the modified date - xChild->setModDate( xRow->getTimestamp( 2 ) ); // date modified + xChild->setModDate( xRow->getTimestamp( 2 ) ); // date modified if ( xRow->wasNull() ) - xChild->setModDate( xRow->getTimestamp( 3 ) ); // fallback: date created + xChild->setModDate( xRow->getTimestamp( 3 ) ); // fallback: date created // push back this content _rxRoot->push_back( xChild ); // is it a folder? if ( xRow->getBoolean( 4 ) && !xRow->wasNull() ) - { // yes -> step down + { // yes -> step down ConstFolderIterator aNextLevelRoot = _rxRoot->end(); --aNextLevelRoot; implReadFolder( *aNextLevelRoot ); @@ -707,8 +707,8 @@ namespace svt m_aCurrentState.swap( aTemplateFolderContent ); // the template directories from the config - String aDirs = SvtPathOptions().GetTemplatePath(); - sal_uInt16 nDirs = aDirs.GetTokenCount( ';' ); + String aDirs = SvtPathOptions().GetTemplatePath(); + sal_uInt16 nDirs = aDirs.GetTokenCount( ';' ); m_aCurrentState.reserve( nDirs ); // loop through all the root-level template folders @@ -798,7 +798,7 @@ namespace svt // open the stream m_pCacheStream = UcbStreamHelper::CreateStream( aStorageURL.GetMainURL( INetURLObject::DECODE_TO_IURI ), - _bForRead ? STREAM_READ | STREAM_NOCREATE : STREAM_WRITE | STREAM_TRUNC ); + _bForRead ? STREAM_READ | STREAM_NOCREATE : STREAM_WRITE | STREAM_TRUNC ); DBG_ASSERT( m_pCacheStream, "TemplateFolderCacheImpl::openCacheStream: could not open/create the cache stream!" ); if ( m_pCacheStream && m_pCacheStream->GetErrorCode() ) { @@ -824,7 +824,7 @@ namespace svt { // open the stream which contains the cached state of the directories if ( openCacheStream( sal_True ) ) - { // opening the stream succeeded + { // opening the stream succeeded if ( readPreviousState() ) { m_bNeedsUpdate = !equalStates( m_aPreviousState, m_aCurrentState ); @@ -915,7 +915,7 @@ namespace svt } //......................................................................... -} // namespace sfx2 +} // namespace sfx2 //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 50ad17317955..567a47d7ed84 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -394,14 +394,14 @@ Any SAL_CALL TransferableHelper::getTransferData( const DataFlavor& rFlavor ) th if( maAny >>= aSeq ) { - SvMemoryStream* pSrcStm = new SvMemoryStream( (char*) aSeq.getConstArray(), aSeq.getLength(), STREAM_WRITE | STREAM_TRUNC ); - GDIMetaFile aMtf; + SvMemoryStream* pSrcStm = new SvMemoryStream( (char*) aSeq.getConstArray(), aSeq.getLength(), STREAM_WRITE | STREAM_TRUNC ); + GDIMetaFile aMtf; *pSrcStm >> aMtf; delete pSrcStm; - Graphic aGraphic( aMtf ); - SvMemoryStream aDstStm( 65535, 65535 ); + Graphic aGraphic( aMtf ); + SvMemoryStream aDstStm( 65535, 65535 ); if( GraphicConverter::Export( aDstStm, aGraphic, CVT_EMF ) == ERRCODE_NONE ) { @@ -424,14 +424,14 @@ Any SAL_CALL TransferableHelper::getTransferData( const DataFlavor& rFlavor ) th if( maAny >>= aSeq ) { - SvMemoryStream* pSrcStm = new SvMemoryStream( (char*) aSeq.getConstArray(), aSeq.getLength(), STREAM_WRITE | STREAM_TRUNC ); - GDIMetaFile aMtf; + SvMemoryStream* pSrcStm = new SvMemoryStream( (char*) aSeq.getConstArray(), aSeq.getLength(), STREAM_WRITE | STREAM_TRUNC ); + GDIMetaFile aMtf; *pSrcStm >> aMtf; delete pSrcStm; - SvMemoryStream aDstStm( 65535, 65535 ); - + SvMemoryStream aDstStm( 65535, 65535 ); + // taking wmf without file header if ( ConvertGDIMetaFileToWMF( aMtf, aDstStm, NULL, FALSE ) ) { @@ -482,9 +482,9 @@ Sequence< DataFlavor > SAL_CALL TransferableHelper::getTransferDataFlavors() thr { } - Sequence< DataFlavor > aRet( mpFormats->size() ); - DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); - sal_uInt32 nCurPos = 0; + Sequence< DataFlavor > aRet( mpFormats->size() ); + DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); + sal_uInt32 nCurPos = 0; while( aIter != aEnd ) { @@ -499,7 +499,7 @@ Sequence< DataFlavor > SAL_CALL TransferableHelper::getTransferDataFlavors() thr sal_Bool SAL_CALL TransferableHelper::isDataFlavorSupported( const DataFlavor& rFlavor ) throw( RuntimeException ) { const SolarMutexGuard aGuard; - sal_Bool bRet = sal_False; + sal_Bool bRet = sal_False; try { @@ -625,8 +625,8 @@ void TransferableHelper::ImplFlush() { if( mxClipboard.is() ) { - Reference< XFlushableClipboard > xFlushableClipboard( mxClipboard, UNO_QUERY ); - const sal_uInt32 nRef = Application::ReleaseSolarMutex(); + Reference< XFlushableClipboard > xFlushableClipboard( mxClipboard, UNO_QUERY ); + const sal_uInt32 nRef = Application::ReleaseSolarMutex(); try { @@ -744,8 +744,8 @@ void TransferableHelper::RemoveFormat( const DataFlavor& rFlavor ) sal_Bool TransferableHelper::HasFormat( SotFormatStringId nFormat ) { - DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); - sal_Bool bRet = sal_False; + DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); + sal_Bool bRet = sal_False; while( aIter != aEnd ) { @@ -787,9 +787,9 @@ sal_Bool TransferableHelper::SetString( const ::rtl::OUString& rString, const Da SotExchange::GetFormatDataFlavor( FORMAT_FILE, aFileFlavor ) && TransferableDataHelper::IsEqual( aFileFlavor, rFlavor ) ) { - const String aString( rString ); - const ByteString aByteStr( aString, gsl_getSystemTextEncoding() ); - Sequence< sal_Int8 > aSeq( aByteStr.Len() + 1 ); + const String aString( rString ); + const ByteString aByteStr( aString, gsl_getSystemTextEncoding() ); + Sequence< sal_Int8 > aSeq( aByteStr.Len() + 1 ); rtl_copyMemory( aSeq.getArray(), aByteStr.GetBuffer(), aByteStr.Len() ); aSeq[ aByteStr.Len() ] = 0; @@ -928,9 +928,9 @@ sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk, #ifdef WNT case SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR: { - Sequence< sal_Int8 > aSeq( sizeof( FILEGROUPDESCRIPTOR ) ); - FILEGROUPDESCRIPTOR* pFDesc = (FILEGROUPDESCRIPTOR*) aSeq.getArray(); - FILEDESCRIPTOR& rFDesc1 = pFDesc->fgd[ 0 ]; + Sequence< sal_Int8 > aSeq( sizeof( FILEGROUPDESCRIPTOR ) ); + FILEGROUPDESCRIPTOR* pFDesc = (FILEGROUPDESCRIPTOR*) aSeq.getArray(); + FILEDESCRIPTOR& rFDesc1 = pFDesc->fgd[ 0 ]; pFDesc->cItems = 1; memset( &rFDesc1, 0, sizeof( FILEDESCRIPTOR ) ); @@ -1005,8 +1005,8 @@ sal_Bool TransferableHelper::SetObject( void* pUserObject, sal_uInt32 nUserObjec if( pUserObject && WriteObject( xStm, pUserObject, nUserObjectId, rFlavor ) ) { - const sal_uInt32 nLen = xStm->Seek( STREAM_SEEK_TO_END ); - Sequence< sal_Int8 > aSeq( nLen ); + const sal_uInt32 nLen = xStm->Seek( STREAM_SEEK_TO_END ); + Sequence< sal_Int8 > aSeq( nLen ); xStm->Seek( STREAM_SEEK_TO_BEGIN ); xStm->Read( aSeq.getArray(), nLen ); @@ -1014,9 +1014,9 @@ sal_Bool TransferableHelper::SetObject( void* pUserObject, sal_uInt32 nUserObjec if( nLen && ( SotExchange::GetFormat( rFlavor ) == SOT_FORMAT_STRING ) ) { //JP 24.7.2001: as I know was this only for the writer application and this - // writes now UTF16 format into the stream + // writes now UTF16 format into the stream //JP 6.8.2001: and now it writes UTF8 because then exist no problem with - // little / big endians! - Bug 88121 + // little / big endians! - Bug 88121 maAny <<= ::rtl::OUString( reinterpret_cast< const sal_Char* >( aSeq.getConstArray() ), nLen - 1, RTL_TEXTENCODING_UTF8 ); } else @@ -1161,19 +1161,19 @@ void TransferableHelper::StartDrag( Window* pWindow, sal_Int8 nDnDSourceActions, if( pWindow->IsMouseCaptured() ) pWindow->ReleaseMouse(); - const Point aPt( pWindow->GetPointerPosPixel() ); + const Point aPt( pWindow->GetPointerPosPixel() ); // On Mac OS X we are forced to execute 'startDrag' synchronously // contrary to the XDragSource interface specification because - // we can receive drag events from the system only in the main + // we can receive drag events from the system only in the main // thread #if !defined(QUARTZ) const sal_uInt32 nRef = Application::ReleaseSolarMutex(); -#endif +#endif try { - DragGestureEvent aEvt; + DragGestureEvent aEvt; aEvt.DragAction = DNDConstants::ACTION_COPY; aEvt.DragOriginX = aPt.X(); aEvt.DragOriginY = aPt.Y(); @@ -1188,7 +1188,7 @@ void TransferableHelper::StartDrag( Window* pWindow, sal_Int8 nDnDSourceActions, // See above for the reason of this define #if !defined(QUARTZ) Application::AcquireSolarMutex( nRef ); -#endif +#endif } } @@ -1212,7 +1212,7 @@ Reference< XClipboard> TransferableHelper::GetSystemClipboard() if( pFocusWindow ) return pFocusWindow->GetClipboard(); - return Reference< XClipboard > (); + return Reference< XClipboard > (); } // ----------------------------------------------------------------------------- @@ -1243,7 +1243,7 @@ class TransferableClipboardNotifier : public ::cppu::WeakImplHelper1< XClipboard private: ::osl::Mutex& mrMutex; Reference< XClipboardNotifier > mxNotifier; - TransferableDataHelper* mpListener; + TransferableDataHelper* mpListener; protected: // XClipboardListener @@ -1415,7 +1415,7 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor { Reference< XMultiServiceFactory > xFact( ::comphelper::getProcessServiceFactory() ); Reference< XMimeContentTypeFactory > xMimeFact; - DataFlavorEx aFlavorEx; + DataFlavorEx aFlavorEx; const ::rtl::OUString aCharsetStr( ::rtl::OUString::createFromAscii( "charset" ) ); if( xFact.is() ) @@ -1425,7 +1425,7 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor for( sal_Int32 i = 0; i < rDataFlavorSeq.getLength(); i++ ) { - const DataFlavor& rFlavor = rDataFlavorSeq[ i ]; + const DataFlavor& rFlavor = rDataFlavorSeq[ i ]; Reference< XMimeContentType > xMimeType; try @@ -1542,8 +1542,8 @@ sal_Bool TransferableDataHelper::HasFormat( SotFormatStringId nFormat ) const { ::osl::MutexGuard aGuard( mpImpl->maMutex ); - DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); - sal_Bool bRet = sal_False; + DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); + sal_Bool bRet = sal_False; while( aIter != aEnd ) { @@ -1563,8 +1563,8 @@ sal_Bool TransferableDataHelper::HasFormat( const DataFlavor& rFlavor ) const { ::osl::MutexGuard aGuard( mpImpl->maMutex ); - DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); - sal_Bool bRet = sal_False; + DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); + sal_Bool bRet = sal_False; while( aIter != aEnd ) { @@ -1638,7 +1638,7 @@ Reference< XTransferable > TransferableDataHelper::GetXTransferable() const // ----------------------------------------------------------------------------- -Any TransferableDataHelper::GetAny( SotFormatStringId nFormat ) const +Any TransferableDataHelper::GetAny( SotFormatStringId nFormat ) const { Any aReturn; @@ -1771,8 +1771,8 @@ sal_Bool TransferableDataHelper::GetBitmap( SotFormatStringId nFormat, Bitmap& r sal_Bool TransferableDataHelper::GetBitmap( const DataFlavor& rFlavor, Bitmap& rBmp ) { SotStorageStreamRef xStm; - DataFlavor aSubstFlavor; - sal_Bool bRet = GetSotStorageStream( rFlavor, xStm ); + DataFlavor aSubstFlavor; + sal_Bool bRet = GetSotStorageStream( rFlavor, xStm ); if( bRet ) { @@ -1826,8 +1826,8 @@ sal_Bool TransferableDataHelper::GetGDIMetaFile( SotFormatStringId nFormat, GDIM sal_Bool TransferableDataHelper::GetGDIMetaFile( const DataFlavor& rFlavor, GDIMetaFile& rMtf ) { SotStorageStreamRef xStm; - DataFlavor aSubstFlavor; - sal_Bool bRet = sal_False; + DataFlavor aSubstFlavor; + sal_Bool bRet = sal_False; if( GetSotStorageStream( rFlavor, xStm ) ) { @@ -1878,10 +1878,10 @@ sal_Bool TransferableDataHelper::GetGraphic( SotFormatStringId nFormat, Graphic& sal_Bool TransferableDataHelper::GetGraphic( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, Graphic& rGraphic ) { - DataFlavor aFlavor; - sal_Bool bRet = sal_False; + DataFlavor aFlavor; + sal_Bool bRet = sal_False; - if( SotExchange::GetFormatDataFlavor( SOT_FORMAT_BITMAP, aFlavor ) && + if( SotExchange::GetFormatDataFlavor( SOT_FORMAT_BITMAP, aFlavor ) && TransferableDataHelper::IsEqual( aFlavor, rFlavor ) ) { Bitmap aBmp; @@ -1924,7 +1924,7 @@ sal_Bool TransferableDataHelper::GetImageMap( SotFormatStringId nFormat, ImageMa sal_Bool TransferableDataHelper::GetImageMap( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ImageMap& rIMap ) { SotStorageStreamRef xStm; - sal_Bool bRet = GetSotStorageStream( rFlavor, xStm ); + sal_Bool bRet = GetSotStorageStream( rFlavor, xStm ); if( bRet ) { @@ -1982,8 +1982,8 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr } else { - String aURL, aDesc; - sal_uInt16 nStart = aString.Search( '@' ), nLen = (sal_uInt16) aString.ToInt32(); + String aURL, aDesc; + sal_uInt16 nStart = aString.Search( '@' ), nLen = (sal_uInt16) aString.ToInt32(); if( !nLen && aString.GetChar( 0 ) != '0' ) { @@ -2040,8 +2040,8 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr if( pFDesc->cItems ) { - ByteString aDesc( pFDesc->fgd[ 0 ].cFileName ); - rtl_TextEncoding eTextEncoding = gsl_getSystemTextEncoding(); + ByteString aDesc( pFDesc->fgd[ 0 ].cFileName ); + rtl_TextEncoding eTextEncoding = gsl_getSystemTextEncoding(); if( ( aDesc.Len() > 4 ) && aDesc.Copy( aDesc.Len() - 4 ).EqualsIgnoreCaseAscii( ".URL" ) ) { @@ -2066,8 +2066,8 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr if( pStream ) { - ByteString aLine; - sal_Bool bSttFnd = sal_False; + ByteString aLine; + sal_Bool bSttFnd = sal_False; while( pStream->ReadLine( aLine ) ) { @@ -2196,8 +2196,8 @@ sal_Bool TransferableDataHelper::GetSotStorageStream( SotFormatStringId nFormat, sal_Bool TransferableDataHelper::GetSotStorageStream( const DataFlavor& rFlavor, SotStorageStreamRef& rxStream ) { - Sequence< sal_Int8 > aSeq; - sal_Bool bRet = GetSequence( rFlavor, aSeq ); + Sequence< sal_Int8 > aSeq; + sal_Bool bRet = GetSequence( rFlavor, aSeq ); if( bRet ) { @@ -2219,8 +2219,8 @@ sal_Bool TransferableDataHelper::GetInputStream( SotFormatStringId nFormat, Refe sal_Bool TransferableDataHelper::GetInputStream( const DataFlavor& rFlavor, Reference < XInputStream >& rxStream ) { - Sequence< sal_Int8 > aSeq; - sal_Bool bRet = GetSequence( rFlavor, aSeq ); + Sequence< sal_Int8 > aSeq; + sal_Bool bRet = GetSequence( rFlavor, aSeq ); if( bRet ) rxStream = new ::comphelper::SequenceInputStream( aSeq ); @@ -2286,8 +2286,8 @@ TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard( Window { DBG_ASSERT( pWindow, "Window pointer is NULL" ); - Reference< XClipboard > xClipboard; - TransferableDataHelper aRet; + Reference< XClipboard > xClipboard; + TransferableDataHelper aRet; if( pWindow ) xClipboard = pWindow->GetClipboard(); @@ -2321,8 +2321,8 @@ TransferableDataHelper TransferableDataHelper::CreateFromSelection( Window* pWin { DBG_ASSERT( pWindow, "Window pointer is NULL" ); - Reference< XClipboard > xSelection; - TransferableDataHelper aRet; + Reference< XClipboard > xSelection; + TransferableDataHelper aRet; if( pWindow ) xSelection = pWindow->GetPrimarySelection(); @@ -2358,7 +2358,7 @@ sal_Bool TransferableDataHelper::IsEqual( const ::com::sun::star::datatransfer:: { Reference< XMultiServiceFactory > xFact( ::comphelper::getProcessServiceFactory() ); Reference< XMimeContentTypeFactory > xMimeFact; - sal_Bool bRet = sal_False; + sal_Bool bRet = sal_False; try { diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx index 3ef70f236b0d..8d31d86fd068 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/svtools/source/misc/transfer2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -339,8 +339,8 @@ sal_Int8 DropTargetHelper::ExecuteDrop( const ExecuteDropEvent& ) sal_Bool DropTargetHelper::IsDropFormatSupported( SotFormatStringId nFormat ) { - DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); - sal_Bool bRet = sal_False; + DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); + sal_Bool bRet = sal_False; while( aIter != aEnd ) { @@ -358,8 +358,8 @@ sal_Bool DropTargetHelper::IsDropFormatSupported( SotFormatStringId nFormat ) sal_Bool DropTargetHelper::IsDropFormatSupported( const DataFlavor& rFlavor ) { - DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); - sal_Bool bRet = sal_False; + DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); + sal_Bool bRet = sal_False; while( aIter != aEnd ) { @@ -433,7 +433,7 @@ void TransferDataContainer::AddSupportedFormats() sal_Bool TransferDataContainer::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { - TDataCntnrEntryList::iterator aIter( pImpl->aFmtList.begin() ), + TDataCntnrEntryList::iterator aIter( pImpl->aFmtList.begin() ), aEnd( pImpl->aFmtList.end() ); sal_Bool bFnd = sal_False; ULONG nFmtId = SotExchange::GetFormat( rFlavor ); diff --git a/svtools/source/misc/unitconv.cxx b/svtools/source/misc/unitconv.cxx index 130c8edc24c8..4a5a4827c3e2 100644 --- a/svtools/source/misc/unitconv.cxx +++ b/svtools/source/misc/unitconv.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ void SetFieldUnit( MetricField& rField, FieldUnit eUnit, BOOL bAll ) { - sal_Int64 nFirst = rField.Denormalize( rField.GetFirst( FUNIT_TWIP ) ); + sal_Int64 nFirst = rField.Denormalize( rField.GetFirst( FUNIT_TWIP ) ); sal_Int64 nLast = rField.Denormalize( rField.GetLast( FUNIT_TWIP ) ); sal_Int64 nMin = rField.Denormalize( rField.GetMin( FUNIT_TWIP ) ); sal_Int64 nMax = rField.Denormalize( rField.GetMax( FUNIT_TWIP ) ); @@ -174,10 +174,10 @@ long CalcToUnit( float nIn, SfxMapUnit eUnit ) { // nIn ist in Points - DBG_ASSERT( eUnit == SFX_MAPUNIT_TWIP || - eUnit == SFX_MAPUNIT_100TH_MM || - eUnit == SFX_MAPUNIT_10TH_MM || - eUnit == SFX_MAPUNIT_MM || + DBG_ASSERT( eUnit == SFX_MAPUNIT_TWIP || + eUnit == SFX_MAPUNIT_100TH_MM || + eUnit == SFX_MAPUNIT_10TH_MM || + eUnit == SFX_MAPUNIT_MM || eUnit == SFX_MAPUNIT_CM, "this unit is not implemented" ); float nTmp = nIn; @@ -187,17 +187,17 @@ long CalcToUnit( float nIn, SfxMapUnit eUnit ) switch ( eUnit ) { - case SFX_MAPUNIT_100TH_MM: nTmp *= 100; break; - case SFX_MAPUNIT_10TH_MM: nTmp *= 10; break; - case SFX_MAPUNIT_MM: break; - case SFX_MAPUNIT_CM: nTmp /= 10; break; + case SFX_MAPUNIT_100TH_MM: nTmp *= 100; break; + case SFX_MAPUNIT_10TH_MM: nTmp *= 10; break; + case SFX_MAPUNIT_MM: break; + case SFX_MAPUNIT_CM: nTmp /= 10; break; default: ;//prevent warning } nTmp *= 20; long nRet = (long)nTmp; return nRet; -//! return (long)(nTmp * 20); +//! return (long)(nTmp * 20); } // ----------------------------------------------------------------------- @@ -356,10 +356,10 @@ long ConvertValueToUnit( long nVal, SfxMapUnit eUnit ) long CalcToPoint( long nIn, SfxMapUnit eUnit, USHORT nFaktor ) { - DBG_ASSERT( eUnit == SFX_MAPUNIT_TWIP || - eUnit == SFX_MAPUNIT_100TH_MM || - eUnit == SFX_MAPUNIT_10TH_MM || - eUnit == SFX_MAPUNIT_MM || + DBG_ASSERT( eUnit == SFX_MAPUNIT_TWIP || + eUnit == SFX_MAPUNIT_100TH_MM || + eUnit == SFX_MAPUNIT_10TH_MM || + eUnit == SFX_MAPUNIT_MM || eUnit == SFX_MAPUNIT_CM, "this unit is not implemented" ); long nRet = 0; @@ -371,10 +371,10 @@ long CalcToPoint( long nIn, SfxMapUnit eUnit, USHORT nFaktor ) switch ( eUnit ) { - case SFX_MAPUNIT_100TH_MM: nRet /= 100; break; - case SFX_MAPUNIT_10TH_MM: nRet /= 10; break; - case SFX_MAPUNIT_MM: break; - case SFX_MAPUNIT_CM: nRet *= 10; break; + case SFX_MAPUNIT_100TH_MM: nRet /= 100; break; + case SFX_MAPUNIT_10TH_MM: nRet /= 10; break; + case SFX_MAPUNIT_MM: break; + case SFX_MAPUNIT_CM: nRet *= 10; break; default: ;//prevent warning } @@ -707,20 +707,20 @@ long Nothing( long nIn ) FUNC_CONVERT ConvertTable[6][6] = { -// CM, MM INCH POINT PICAS=32 TWIPS - { Nothing, CMToMM, CMToInch, CMToPoint, CMToPica, CMToTwips }, - { MMToCM, Nothing, MMToInch, MMToPoint, MMToPica, MMToTwips }, - { InchToCM, InchToMM, Nothing, InchToPoint, InchToPica, InchToTwips }, - { PointToCM, PointToMM, PointToInch, Nothing, PointToPica, PointToTwips }, - { PicaToCM, PicaToMM, PicaToInch, PicaToPoint, Nothing, PicaToTwips }, - { TwipsToCM, TwipsToMM, TwipsToInch, TwipsToPoint,TwipsToPica, Nothing } +// CM, MM INCH POINT PICAS=32 TWIPS + { Nothing, CMToMM, CMToInch, CMToPoint, CMToPica, CMToTwips }, + { MMToCM, Nothing, MMToInch, MMToPoint, MMToPica, MMToTwips }, + { InchToCM, InchToMM, Nothing, InchToPoint, InchToPica, InchToTwips }, + { PointToCM, PointToMM, PointToInch, Nothing, PointToPica, PointToTwips }, + { PicaToCM, PicaToMM, PicaToInch, PicaToPoint, Nothing, PicaToTwips }, + { TwipsToCM, TwipsToMM, TwipsToInch, TwipsToPoint,TwipsToPica, Nothing } }; // ----------------------------------------------------------------------- long TransformMetric( long nVal, FieldUnit aOld, FieldUnit aNew ) { - if ( aOld == FUNIT_NONE || aNew == FUNIT_NONE || + if ( aOld == FUNIT_NONE || aNew == FUNIT_NONE || aOld == FUNIT_CUSTOM || aNew == FUNIT_CUSTOM ) { return nVal; diff --git a/svtools/source/misc/wallitem.cxx b/svtools/source/misc/wallitem.cxx index 147cd0a6b154..82cd8aadb394 100644 --- a/svtools/source/misc/wallitem.cxx +++ b/svtools/source/misc/wallitem.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svtools/source/misc/xwindowitem.cxx b/svtools/source/misc/xwindowitem.cxx index d801d06317b8..791b7e72501b 100644 --- a/svtools/source/misc/xwindowitem.cxx +++ b/svtools/source/misc/xwindowitem.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,8 +40,8 @@ using namespace ::com::sun::star; TYPEINIT1_FACTORY( XWindowItem, SfxPoolItem, new XWindowItem ); - -XWindowItem::XWindowItem() : + +XWindowItem::XWindowItem() : SfxPoolItem() { } @@ -58,16 +58,16 @@ XWindowItem::XWindowItem( USHORT nWhichId, Window * pWin ) : } } - + XWindowItem::XWindowItem( USHORT nWhichId, uno::Reference< awt::XWindow > & rxWin ) : - SfxPoolItem( nWhichId ), + SfxPoolItem( nWhichId ), m_xWin( rxWin ) { -} +} XWindowItem::XWindowItem( const XWindowItem &rItem ) : - SfxPoolItem( Which() ), + SfxPoolItem( Which() ), m_xWin( rItem.m_xWin ) { } @@ -77,12 +77,12 @@ XWindowItem::~XWindowItem() { } - + SfxPoolItem * XWindowItem::Clone( SfxItemPool* /*pPool*/ ) const { return new XWindowItem( *this ); } - + int XWindowItem::operator == ( const SfxPoolItem & rAttr ) const { |