diff options
Diffstat (limited to 'basctl/source')
107 files changed, 1669 insertions, 1669 deletions
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx index b2b20e105b4e..2d5fcfb9279f 100644 --- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx +++ b/basctl/source/accessibility/accessibledialogcontrolshape.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 @@ -190,7 +190,7 @@ void AccessibleDialogControlShape::SetBounds( const awt::Rectangle& aBounds ) // ----------------------------------------------------------------------------- -Window* AccessibleDialogControlShape::GetWindow() const +Window* AccessibleDialogControlShape::GetWindow() const { Window* pWindow = NULL; if ( m_pDlgEdObj ) @@ -205,7 +205,7 @@ Window* AccessibleDialogControlShape::GetWindow() const // ----------------------------------------------------------------------------- -::rtl::OUString AccessibleDialogControlShape::GetModelStringProperty( const sal_Char* pPropertyName ) +::rtl::OUString AccessibleDialogControlShape::GetModelStringProperty( const sal_Char* pPropertyName ) { ::rtl::OUString sReturn; @@ -251,7 +251,7 @@ void AccessibleDialogControlShape::FillAccessibleStateSet( utl::AccessibleStateS } // ----------------------------------------------------------------------------- -// OCommonAccessibleComponent +// OCommonAccessibleComponent // ----------------------------------------------------------------------------- awt::Rectangle AccessibleDialogControlShape::implGetBounds() throw (RuntimeException) @@ -444,7 +444,7 @@ sal_Int16 AccessibleDialogControlShape::getAccessibleRole( ) throw (RuntimeExce // ----------------------------------------------------------------------------- -::rtl::OUString AccessibleDialogControlShape::getAccessibleDescription( ) throw (RuntimeException) +::rtl::OUString AccessibleDialogControlShape::getAccessibleDescription( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -521,7 +521,7 @@ void AccessibleDialogControlShape::grabFocus( ) throw (RuntimeException) // ----------------------------------------------------------------------------- -sal_Int32 AccessibleDialogControlShape::getForeground( ) throw (RuntimeException) +sal_Int32 AccessibleDialogControlShape::getForeground( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx index b8c43e4daa37..64629dc27fcf 100644 --- a/basctl/source/accessibility/accessibledialogwindow.cxx +++ b/basctl/source/accessibility/accessibledialogwindow.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 @@ -60,13 +60,13 @@ DBG_NAME( AccessibleDialogWindow ) // ----------------------------------------------------------------------------- -// class ChildDescriptor +// class ChildDescriptor // ----------------------------------------------------------------------------- AccessibleDialogWindow::ChildDescriptor::ChildDescriptor( DlgEdObj* _pDlgEdObj ) :pDlgEdObj( _pDlgEdObj ) ,rxAccessible( 0 ) -{ +{ } // ----------------------------------------------------------------------------- @@ -116,7 +116,7 @@ bool AccessibleDialogWindow::ChildDescriptor::operator<( const ChildDescriptor& } // ----------------------------------------------------------------------------- -// class AccessibleDialogWindow +// class AccessibleDialogWindow // ----------------------------------------------------------------------------- AccessibleDialogWindow::AccessibleDialogWindow( DialogWindow* pDialogWindow ) @@ -338,7 +338,7 @@ void AccessibleDialogWindow::RemoveChild( const ChildDescriptor& rDesc ) void AccessibleDialogWindow::UpdateChild( const ChildDescriptor& rDesc ) { if ( IsChildVisible( rDesc ) ) - { + { // if the object is not in the child list, insert child InsertChild( rDesc ); } @@ -443,13 +443,13 @@ void AccessibleDialogWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindo case VCLEVENT_WINDOW_SHOW: { aNewValue <<= AccessibleStateType::SHOWING; - NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); + NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); } break; case VCLEVENT_WINDOW_HIDE: { aOldValue <<= AccessibleStateType::SHOWING; - NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); + NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); } break; case VCLEVENT_WINDOW_RESIZE: @@ -518,7 +518,7 @@ void AccessibleDialogWindow::FillAccessibleStateSet( utl::AccessibleStateSetHelp } // ----------------------------------------------------------------------------- -// OCommonAccessibleComponent +// OCommonAccessibleComponent // ----------------------------------------------------------------------------- awt::Rectangle AccessibleDialogWindow::implGetBounds() throw (RuntimeException) @@ -551,7 +551,7 @@ void AccessibleDialogWindow::Notify( SfxBroadcaster&, const SfxHint& rHint ) if ( IsChildVisible( aDesc ) ) InsertChild( aDesc ); } - } + } break; case HINT_OBJREMOVED: { @@ -778,7 +778,7 @@ sal_Int16 AccessibleDialogWindow::getAccessibleRole( ) throw (RuntimeException) // ----------------------------------------------------------------------------- -::rtl::OUString AccessibleDialogWindow::getAccessibleDescription( ) throw (RuntimeException) +::rtl::OUString AccessibleDialogWindow::getAccessibleDescription( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -856,8 +856,8 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleAtPoint( const awt { Reference< XAccessible > xAcc = getAccessibleChild( i ); if ( xAcc.is() ) - { - Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY ); + { + Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY ); if ( xComp.is() ) { Rectangle aRect = VCLRectangle( xComp->getBounds() ); @@ -1007,7 +1007,7 @@ void AccessibleDialogWindow::selectAccessibleChild( sal_Int32 nChildIndex ) thro // ----------------------------------------------------------------------------- sal_Bool AccessibleDialogWindow::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) -{ +{ OExternalLockGuard aGuard( this ); if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() ) @@ -1065,7 +1065,7 @@ sal_Int32 AccessibleDialogWindow::getSelectedAccessibleChildCount( ) throw (Run sal_Int32 nRet = 0; for ( sal_Int32 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i ) - { + { if ( isAccessibleChildSelected( i ) ) ++nRet; } @@ -1085,7 +1085,7 @@ Reference< XAccessible > AccessibleDialogWindow::getSelectedAccessibleChild( sal Reference< XAccessible > xChild; for ( sal_Int32 i = 0, j = 0, nCount = getAccessibleChildCount(); i < nCount; ++i ) - { + { if ( isAccessibleChildSelected( i ) && ( j++ == nSelectedChildIndex ) ) { xChild = getAccessibleChild( i ); diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx index 83d2d10e1256..c1123b836100 100644 --- a/basctl/source/basicide/basdoc.cxx +++ b/basctl/source/basicide/basdoc.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 @@ -121,7 +121,7 @@ void BasicDocShell::FillStatusBar( StatusBar& rStatusBar ) rStatusBar.InsertItem( SID_ATTR_SIZE, rStatusBar.GetTextWidth( aTmp ), SIB_AUTOSIZE | SIB_LEFT | SIB_USERDRAW ); -// return pStatusBar; +// return pStatusBar; } diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx index ba98e47efee1..48d0b072a0e1 100644 --- a/basctl/source/basicide/basdoc.hxx +++ b/basctl/source/basicide/basdoc.hxx @@ -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,10 +37,10 @@ class SfxPrinter; class BasicDocShell: public SfxObjectShell { - SfxPrinter* pPrinter; + SfxPrinter* pPrinter; protected: - virtual void FillStatusBar( StatusBar& rBar); + virtual void FillStatusBar( StatusBar& rBar); virtual void Draw( OutputDevice *, const JobSetup & rSetup, USHORT nAspect = ASPECT_CONTENT ); virtual void FillClass( SvGlobalName * pClassName, @@ -60,10 +60,10 @@ public: BasicDocShell(); ~BasicDocShell(); - SfxPrinter* GetPrinter( BOOL bCreate ); - void SetPrinter( SfxPrinter* pPrinter ); + SfxPrinter* GetPrinter( BOOL bCreate ); + void SetPrinter( SfxPrinter* pPrinter ); }; -#endif // _BASDOC_HXX +#endif // _BASDOC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx index 9ac79df53864..b775a6b13936 100644 --- a/basctl/source/basicide/basicbox.cxx +++ b/basctl/source/basicide/basicbox.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 @@ -168,7 +168,7 @@ BasicLibBox::BasicLibBox( Window* pParent, const uno::Reference< frame::XFrame > m_xFrame( rFrame ) { FillBox(); - bIgnoreSelect = TRUE; // Select von 0 noch nicht weiterleiten + bIgnoreSelect = TRUE; // Select von 0 noch nicht weiterleiten bFillBox = TRUE; SelectEntryPos( 0 ); aCurText = GetEntry( 0 ); @@ -186,7 +186,7 @@ __EXPORT BasicLibBox::~BasicLibBox() void __EXPORT BasicLibBox::Update( const SfxStringItem* pItem ) { // Immer auf dem laufenden sein... -// if ( !pItem || !pItem->GetValue().Len() ) +// if ( !pItem || !pItem->GetValue().Len() ) FillBox(); if ( pItem ) @@ -208,7 +208,7 @@ void __EXPORT BasicLibBox::ReleaseFocus() if ( pCurSh ) { Window* pShellWin = pCurSh->GetWindow(); - if ( !pShellWin ) // sonst werde ich ihn nicht los + if ( !pShellWin ) // sonst werde ich ihn nicht los pShellWin = Application::GetDefDialogParent(); pShellWin->GrabFocus(); @@ -245,7 +245,7 @@ void BasicLibBox::FillBox() SelectEntry( aCurText ); if ( !GetSelectEntryCount() ) { - SelectEntryPos( GetEntryCount() ); // gibst es nicht => leer? + SelectEntryPos( GetEntryCount() ); // gibst es nicht => leer? aCurText = GetSelectEntry(); } bIgnoreSelect = FALSE; @@ -323,7 +323,7 @@ void __EXPORT BasicLibBox::Select() if ( !bIgnoreSelect ) NotifyIDE(); else - SelectEntry( aCurText ); // Seit 306... (Select nach Escape) + SelectEntry( aCurText ); // Seit 306... (Select nach Escape) } } @@ -497,7 +497,7 @@ void BasicLanguageBox::Select() if ( !m_bIgnoreSelect ) SetLanguage(); else - SelectEntry( m_sCurrentText ); // Select after Escape + SelectEntry( m_sCurrentText ); // Select after Escape } long BasicLanguageBox::PreNotify( NotifyEvent& rNEvt ) diff --git a/basctl/source/basicide/basicbox.hxx b/basctl/source/basicide/basicbox.hxx index f5a938194889..8932fb454c39 100644 --- a/basctl/source/basicide/basicbox.hxx +++ b/basctl/source/basicide/basicbox.hxx @@ -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 @@ -44,9 +44,9 @@ public: LibBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); ~LibBoxControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual Window* CreateItemWindow( Window *pParent ); + virtual Window* CreateItemWindow( Window *pParent ); }; /** base class for list boxes which need to update their content according to the list @@ -83,31 +83,31 @@ private: class BasicLibBox : public DocListenerBox { private: - String aCurText; - BOOL bIgnoreSelect; - BOOL bFillBox; + String aCurText; + BOOL bIgnoreSelect; + BOOL bFillBox; com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; - void ReleaseFocus(); + void ReleaseFocus(); void InsertEntries( const ScriptDocument& rDocument, LibraryLocation eLocation ); void ClearBox(); - void NotifyIDE(); + void NotifyIDE(); // DocListenerBox - virtual void FillBox(); + virtual void FillBox(); protected: - virtual void Select(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual void Select(); + virtual long PreNotify( NotifyEvent& rNEvt ); public: BasicLibBox( Window* pParent, const com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); ~BasicLibBox(); - using Window::Update; - void Update( const SfxStringItem* pItem ); + using Window::Update; + void Update( const SfxStringItem* pItem ); }; class LanguageBoxControl: public SfxToolBoxControl @@ -118,37 +118,37 @@ public: LanguageBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); ~LanguageBoxControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual Window* CreateItemWindow( Window *pParent ); + virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual Window* CreateItemWindow( Window *pParent ); }; class BasicLanguageBox : public DocListenerBox { private: - String m_sNotLocalizedStr; - String m_sDefaultLanguageStr; - String m_sCurrentText; + String m_sNotLocalizedStr; + String m_sDefaultLanguageStr; + String m_sCurrentText; - bool m_bIgnoreSelect; + bool m_bIgnoreSelect; void ClearBox(); - void SetLanguage(); + void SetLanguage(); // DocListenerBox - virtual void FillBox(); + virtual void FillBox(); protected: - virtual void Select(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual void Select(); + virtual long PreNotify( NotifyEvent& rNEvt ); public: BasicLanguageBox( Window* pParent ); ~BasicLanguageBox(); - using Window::Update; - void Update( const SfxStringItem* pItem ); + using Window::Update; + void Update( const SfxStringItem* pItem ); }; -#endif // _BASICBOX_HXX +#endif // _BASICBOX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/basicmod.hxx b/basctl/source/basicide/basicmod.hxx index da7556613561..8bbc72fa1b2e 100644 --- a/basctl/source/basicide/basicmod.hxx +++ b/basctl/source/basicide/basicmod.hxx @@ -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/basctl/source/basicide/basicprint.src b/basctl/source/basicide/basicprint.src index 1f301d3461a9..a5d9a8351673 100644 --- a/basctl/source/basicide/basicprint.src +++ b/basctl/source/basicide/basicprint.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/basctl/source/basicide/basicrenderable.cxx b/basctl/source/basicide/basicrenderable.cxx index 889e09b7f633..6946f5a44537 100644 --- a/basctl/source/basicide/basicrenderable.cxx +++ b/basctl/source/basicide/basicrenderable.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 @@ BasicRenderable::BasicRenderable( IDEBaseWindow* pWin ) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageRange" ) ), rtl::OUString(), aPageRangeOpt - ); + ); } BasicRenderable::~BasicRenderable() @@ -130,10 +130,10 @@ sal_Int32 SAL_CALL BasicRenderable::getRendererCount ( else throw lang::IllegalArgumentException(); } - + return nCount; } - + Sequence<beans::PropertyValue> SAL_CALL BasicRenderable::getRenderer ( sal_Int32, const Any&, const Sequence<beans::PropertyValue>& i_xOptions ) throw (lang::IllegalArgumentException, RuntimeException) @@ -147,7 +147,7 @@ Sequence<beans::PropertyValue> SAL_CALL BasicRenderable::getRenderer ( if( pPrinter ) { Size aPageSize( pPrinter->PixelToLogic( pPrinter->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) ) ); - + aVals.realloc( 1 ); aVals[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageSize" ) ); awt::Size aSize; @@ -155,12 +155,12 @@ Sequence<beans::PropertyValue> SAL_CALL BasicRenderable::getRenderer ( aSize.Height = aPageSize.Height(); aVals[0].Value <<= aSize; } - + appendPrintUIOptions( aVals ); return aVals; } - + void SAL_CALL BasicRenderable::render ( sal_Int32 nRenderer, const Any&, const Sequence<beans::PropertyValue>& i_xOptions diff --git a/basctl/source/basicide/basicrenderable.hxx b/basctl/source/basicide/basicrenderable.hxx index aadddae90ed0..baa5eba87810 100644 --- a/basctl/source/basicide/basicrenderable.hxx +++ b/basctl/source/basicide/basicrenderable.hxx @@ -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 @@ -43,7 +43,7 @@ class BasicRenderable : { IDEBaseWindow* mpWindow; osl::Mutex maMutex; - + Printer* getPrinter(); public: BasicRenderable( IDEBaseWindow* pWin ); @@ -54,13 +54,13 @@ public: const com::sun::star::uno::Any& aSelection, const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue >& xOptions) throw (com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException); - + virtual com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> SAL_CALL getRenderer ( sal_Int32 nRenderer, const com::sun::star::uno::Any& rSelection, const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rxOptions) throw (com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL render ( sal_Int32 nRenderer, const com::sun::star::uno::Any& rSelection, diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index ef1289736106..ba94bd5a1647 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.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 @@ -71,18 +71,18 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -#define SPLIT_MARGIN 5 -#define SPLIT_HEIGHT 2 +#define SPLIT_MARGIN 5 +#define SPLIT_HEIGHT 2 -#define LMARGPRN 1700 -#define RMARGPRN 900 -#define TMARGPRN 2000 -#define BMARGPRN 1000 -#define BORDERPRN 300 +#define LMARGPRN 1700 +#define RMARGPRN 900 +#define TMARGPRN 2000 +#define BMARGPRN 1000 +#define BORDERPRN 300 -#define APPWAIT_START 100 +#define APPWAIT_START 100 -#define VALIDWINDOW 0x1234 +#define VALIDWINDOW 0x1234 #if defined(OW) || defined(MTF) #define FILTERMASK_ALL "*" @@ -102,16 +102,16 @@ using namespace comphelper; DBG_NAME( ModulWindow ) TYPEINIT1( ModulWindow , IDEBaseWindow ); - + void lcl_PrintHeader( Printer* pPrinter, USHORT nPages, USHORT nCurPage, const String& rTitle, bool bOutput ) { - short nLeftMargin = LMARGPRN; + short nLeftMargin = LMARGPRN; Size aSz = pPrinter->GetOutputSize(); short nBorder = BORDERPRN; const Color aOldLineColor( pPrinter->GetLineColor() ); const Color aOldFillColor( pPrinter->GetFillColor() ); - const Font aOldFont( pPrinter->GetFont() ); + const Font aOldFont( pPrinter->GetFont() ); pPrinter->SetLineColor( Color( COL_BLACK ) ); pPrinter->SetFillColor(); @@ -181,13 +181,13 @@ void lcl_ConvertTabsToSpaces( String& rLine ) rLine.Insert( aBlanker, nPos ); nMax = rLine.Len(); } - nPos++; // Nicht optimal, falls Tab, aber auch nicht verkehrt... + nPos++; // Nicht optimal, falls Tab, aber auch nicht verkehrt... } } } -ModulWindow::ModulWindow( ModulWindowLayout* pParent, const ScriptDocument& rDocument, String aLibName, +ModulWindow::ModulWindow( ModulWindowLayout* pParent, const ScriptDocument& rDocument, String aLibName, String aName, ::rtl::OUString& aModule ) :IDEBaseWindow( pParent, rDocument, aLibName, aName ) ,aXEditorWindow( this ) @@ -203,10 +203,10 @@ ModulWindow::ModulWindow( ModulWindowLayout* pParent, const ScriptDocument& rDoc SbModuleRef ModulWindow::XModule() { - // ModuleWindows can now be created as a result of the + // ModuleWindows can now be created as a result of the // modules getting created via the api. This is a result of an // elementInserted event from the BasicLibrary container. - // However the SbModule is also created from a different listener to + // However the SbModule is also created from a different listener to // the same event ( in basmgr ) Therefore it is possible when we look // for xModule it may not yet be available, here we keep tring to access // the module until such time as it exists @@ -252,9 +252,9 @@ void ModulWindow::DoInit() if ( GetVScrollBar() ) GetVScrollBar()->Hide(); GetHScrollBar()->Show(); -// GetEditorWindow().SetScrollBarRanges(); +// GetEditorWindow().SetScrollBarRanges(); GetEditorWindow().InitScrollBars(); -// GetEditorWindow().GrabFocus(); +// GetEditorWindow().GrabFocus(); } @@ -376,7 +376,7 @@ BOOL ModulWindow::BasicExecute() ClearStatus( BASWIN_RUNNINGBASIC ); } else - aStatus.bIsRunning = FALSE; // Abbruch von Reschedule() + aStatus.bIsRunning = FALSE; // Abbruch von Reschedule() } BOOL bDone = !aStatus.bError; @@ -482,7 +482,7 @@ BOOL ModulWindow::LoadBasic() GetEditEngine()->SetUpdateMode( FALSE ); GetEditView()->Read( *pStream ); GetEditEngine()->SetUpdateMode( TRUE ); - GetEditorWindow().Update(); // Es wurde bei UpdateMode = TRUE nur Invalidiert + GetEditorWindow().Update(); // Es wurde bei UpdateMode = TRUE nur Invalidiert GetEditorWindow().ForceSyntaxTimeout(); GetEditorWindow().DestroyProgress(); ULONG nError = aMedium.GetError(); @@ -555,7 +555,7 @@ BOOL ModulWindow::SaveBasicSource() return bDone; } -BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocument& rDocument, const String& aLibName ); +BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocument& rDocument, const String& aLibName ); BOOL ModulWindow::ImportDialog() { @@ -633,7 +633,7 @@ BOOL ModulWindow::BasicToggleBreakPoint() AssertValidEditEngine(); TextSelection aSel = GetEditView()->GetSelection(); - aSel.GetStart().GetPara()++; // Basic-Zeilen beginnen bei 1! + aSel.GetStart().GetPara()++; // Basic-Zeilen beginnen bei 1! aSel.GetEnd().GetPara()++; BOOL bNewBreakPoint = FALSE; @@ -690,8 +690,8 @@ IMPL_LINK( ModulWindow, BasicErrorHdl, StarBASIC *, pBasic ) GoOnTop(); // ReturnWert: BOOL - // FALSE: Abbrechen - // TRUE: Weiter.... + // FALSE: Abbrechen + // TRUE: Weiter.... String aErrorText( pBasic->GetErrorText() ); USHORT nErrorLine = pBasic->GetLine() - 1; USHORT nErrCol1 = pBasic->GetCol1(); @@ -719,8 +719,8 @@ IMPL_LINK( ModulWindow, BasicErrorHdl, StarBASIC *, pBasic ) BOOL bMarkError = ( pBasic == GetBasic() ) ? TRUE : FALSE; if ( bMarkError ) aXEditorWindow.GetBrkWindow().SetMarkerPos( nErrorLine, TRUE ); -// ErrorBox( this, WB_OK | WB_DEF_OK, String( aErrorTextPrefix + aErrorText ) ).Execute(); -// ErrorHandler::HandleError( pBasic->GetErrorCode() ); +// ErrorBox( this, WB_OK | WB_DEF_OK, String( aErrorTextPrefix + aErrorText ) ).Execute(); +// ErrorHandler::HandleError( pBasic->GetErrorCode() ); // #i47002# Reference< awt::XWindow > xWindow = VCLUnoHelper::GetInterface( this ); @@ -742,7 +742,7 @@ long __EXPORT ModulWindow::BasicBreakHdl( StarBASIC* pBasic ) DBG_CHKTHIS( ModulWindow, 0 ); // Ein GoOnTop aktiviert da Fenster, das veraendert aber den Context fuer // das Programm! -// GoOnTop(); +// GoOnTop(); // #i69280 Required in Window despite normal usage in next command! (void)pBasic; @@ -751,7 +751,7 @@ long __EXPORT ModulWindow::BasicBreakHdl( StarBASIC* pBasic ) USHORT nErrorLine = pBasic->GetLine(); // Gibt es hier einen BreakPoint? - BreakPoint* pBrk = GetBreakPoints().FindBreakPoint( nErrorLine ); + BreakPoint* pBrk = GetBreakPoints().FindBreakPoint( nErrorLine ); if ( pBrk ) { pBrk->nHitCount++; @@ -759,7 +759,7 @@ long __EXPORT ModulWindow::BasicBreakHdl( StarBASIC* pBasic ) return aStatus.nBasicFlags; // weiterlaufen... } - nErrorLine--; // EditEngine begint bei 0, Basic bei 1 + nErrorLine--; // EditEngine begint bei 0, Basic bei 1 // Alleine schon damit gescrollt wird... AssertValidEditEngine(); GetEditView()->SetSelection( TextSelection( TextPaM( nErrorLine, 0 ), TextPaM( nErrorLine, 0 ) ) ); @@ -795,7 +795,7 @@ void ModulWindow::BasicAddWatch() BOOL bAdd = TRUE; if ( !GetEditView()->HasSelection() ) { -// bAdd = GetEditView()->SelectCurrentWord(); +// bAdd = GetEditView()->SelectCurrentWord(); TextPaM aWordStart; String aWord = GetEditEngine()->GetWord( GetEditView()->GetSelection().GetEnd(), &aWordStart ); if ( aWord.Len() ) @@ -892,7 +892,7 @@ void __EXPORT ModulWindow::StoreData() GetEditorWindow().SetSourceInBasic( TRUE ); // Nicht das Modify loeschen, sonst wird das Basic nicht gespeichert // Es wird beim Speichern sowieso geloescht. -// xModule->SetModified( FALSE ); +// xModule->SetModified( FALSE ); } BOOL __EXPORT ModulWindow::CanClose() @@ -952,11 +952,11 @@ sal_Int32 ModulWindow::FormatAndPrint( Printer* pPrinter, sal_Int32 nPrintPage ) DBG_CHKTHIS( ModulWindow, 0 ); AssertValidEditEngine(); - + MapMode eOldMapMode( pPrinter->GetMapMode() ); Font aOldFont( pPrinter->GetFont() ); -// Font aFont( GetEditEngine()->CreateFontFromItemSet( GetEditEngine()->GetEmptyItemSet() ) ); +// Font aFont( GetEditEngine()->CreateFontFromItemSet( GetEditEngine()->GetEmptyItemSet() ) ); Font aFont( GetEditEngine()->GetFont() ); aFont.SetAlign( ALIGN_BOTTOM ); aFont.SetTransparent( TRUE ); @@ -1007,7 +1007,7 @@ sal_Int32 ModulWindow::FormatAndPrint( Printer* pPrinter, sal_Int32 nPrintPage ) pPrinter->SetFont( aOldFont ); pPrinter->SetMapMode( eOldMapMode ); - + return sal_Int32(nCurPage); } @@ -1240,8 +1240,8 @@ String __EXPORT ModulWindow::GetTitle() void ModulWindow::FrameWindowMoved() { -// if ( GetEditEngine() && GetEditEngine()->IsInSelectionMode() ) -// GetEditEngine()->StopSelectionMode(); +// if ( GetEditEngine() && GetEditEngine()->IsInSelectionMode() ) +// GetEditEngine()->StopSelectionMode(); } @@ -1395,7 +1395,7 @@ BasicEntryDescriptor ModulWindow::CreateEntryDescriptor() } } break; - } + } case script::ModuleType::FORM: aLibSubName = String( IDEResId( RID_STR_USERFORMS ) ); break; @@ -1513,7 +1513,7 @@ void __EXPORT ModulWindowLayout::Resize() { // ScrollBars, etc. passiert in BasicIDEShell:Adjust... ArrangeWindows(); -// Invalidate(); +// Invalidate(); } void __EXPORT ModulWindowLayout::Paint( const Rectangle& ) @@ -1607,8 +1607,8 @@ IMPL_LINK( ModulWindowLayout, SplitHdl, Splitter *, pSplitter ) BOOL ModulWindowLayout::IsToBeDocked( DockingWindow* pDockingWindow, const Point& rPos, Rectangle& rRect ) { // prueffen, ob als Dock oder als Child: - // TRUE: Floating - // FALSE: Child + // TRUE: Floating + // FALSE: Child Point aPosInMe = ScreenToOutputPixel( rPos ); Size aSz = GetOutputSizePixel(); if ( ( aPosInMe.X() > 0 ) && ( aPosInMe.X() < aSz.Width() ) && diff --git a/basctl/source/basicide/baside2.hrc b/basctl/source/basicide/baside2.hrc index f97a0d897912..0da8274cc6b1 100644 --- a/basctl/source/basicide/baside2.hrc +++ b/basctl/source/basicide/baside2.hrc @@ -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 @@ -32,19 +32,19 @@ // Diese Dateien enthaelt nur die lokalen ID's. // RID_POPUP_BRKPROPS -#define RID_BRKPROPS 1 -#define RID_ACTIV 2 +#define RID_BRKPROPS 1 +#define RID_ACTIV 2 // RID_POPUP_BRKDLG -#define RID_BRKDLG 1 +#define RID_BRKDLG 1 // RID_POPUP_TABBAR -#define RID_INSERT 1 +#define RID_INSERT 1 // ModulWindowLayout -#define IMGID_BRKENABLED ( SID_BASICIDE_IMAGESTART + 20 ) -#define IMGID_BRKDISABLED ( SID_BASICIDE_IMAGESTART + 21 ) -#define IMGID_STEPMARKER ( SID_BASICIDE_IMAGESTART + 22 ) -#define IMGID_ERRORMARKER ( SID_BASICIDE_IMAGESTART + 23 ) +#define IMGID_BRKENABLED ( SID_BASICIDE_IMAGESTART + 20 ) +#define IMGID_BRKDISABLED ( SID_BASICIDE_IMAGESTART + 21 ) +#define IMGID_STEPMARKER ( SID_BASICIDE_IMAGESTART + 22 ) +#define IMGID_ERRORMARKER ( SID_BASICIDE_IMAGESTART + 23 ) -#endif // _BASIDE2_HRC +#endif // _BASIDE2_HRC diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 12ae6a23fb6f..14c4ba3176bb 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -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,7 +52,7 @@ class SvxSearchItem; DBG_NAMEEX( ModulWindow ) -#define MARKER_NOMARKER 0xFFFF +#define MARKER_NOMARKER 0xFFFF namespace utl { @@ -68,15 +68,15 @@ void setTextEngineText( ExtTextEngine* pEngine, const ::rtl::OUString aStr ); class ProgressInfo : public SfxProgress { private: - ULONG nCurState; + ULONG nCurState; public: - inline ProgressInfo( SfxObjectShell* pObjSh, const String& rText, ULONG nRange ); + inline ProgressInfo( SfxObjectShell* pObjSh, const String& rText, ULONG nRange ); -// inline void StartProgress( const String& rName, ULONG nStates ); -// inline void EndProgress(); - inline void StepProgress(); +// inline void StartProgress( const String& rName, ULONG nStates ); +// inline void EndProgress(); + inline void StepProgress(); }; inline ProgressInfo::ProgressInfo( SfxObjectShell* pObjSh, const String& rText, ULONG nRange ) @@ -87,15 +87,15 @@ inline ProgressInfo::ProgressInfo( SfxObjectShell* pObjSh, const String& rText, // inline void ProgressInfo::StartProgress( const String& rName, ULONG nStates ) // { -// nCurState = 0; -// if ( pStbMgr ) -// pStbMgr->StartProgressMode( rName, nStates ); +// nCurState = 0; +// if ( pStbMgr ) +// pStbMgr->StartProgressMode( rName, nStates ); // } // inline void ProgressInfo::EndProgress() // { -// if ( pStbMgr ) -// pStbMgr->EndProgressMode(); +// if ( pStbMgr ) +// pStbMgr->EndProgressMode(); //} inline void ProgressInfo::StepProgress() @@ -111,87 +111,87 @@ class SourceViewConfig; class EditorWindow : public Window, public SfxListener, public utl::ConfigurationListener { private: - ExtTextView* pEditView; - ExtTextEngine* pEditEngine; + ExtTextView* pEditView; + ExtTextEngine* pEditEngine; utl::SourceViewConfig* pSourceViewConfig; - long nCurTextWidth; + long nCurTextWidth; - SyntaxHighlighter aHighlighter; - Timer aSyntaxIdleTimer; - Table aSyntaxLineTable; + SyntaxHighlighter aHighlighter; + Timer aSyntaxIdleTimer; + Table aSyntaxLineTable; DECL_LINK( SyntaxTimerHdl, Timer * ); - ProgressInfo* pProgress; - ModulWindow* pModulWindow; + ProgressInfo* pProgress; + ModulWindow* pModulWindow; virtual void DataChanged(DataChangedEvent const & rDCEvt); - using Window::Notify; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + using Window::Notify; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - void ImpDoHighlight( ULONG nLineOff ); + void ImpDoHighlight( ULONG nLineOff ); void ImplSetFont(); - BOOL bHighlightning; - BOOL bDoSyntaxHighlight; - BOOL bDelayHighlight; + BOOL bHighlightning; + BOOL bDoSyntaxHighlight; + BOOL bDelayHighlight; virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > GetComponentInterface(BOOL bCreate = TRUE); protected: - virtual void Paint( const Rectangle& ); - virtual void Resize(); - virtual void KeyInput( const KeyEvent& rKeyEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void LoseFocus(); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void Paint( const Rectangle& ); + virtual void Resize(); + virtual void KeyInput( const KeyEvent& rKeyEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void Command( const CommandEvent& rCEvt ); + virtual void LoseFocus(); + virtual void RequestHelp( const HelpEvent& rHEvt ); virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); - void DoSyntaxHighlight( ULONG nPara ); - String GetWordAtCursor(); - BOOL ImpCanModify(); + void DoSyntaxHighlight( ULONG nPara ); + String GetWordAtCursor(); + BOOL ImpCanModify(); public: EditorWindow( Window* pParent ); ~EditorWindow(); - ExtTextEngine* GetEditEngine() const { return (ExtTextEngine*)pEditEngine; } - ExtTextView* GetEditView() const { return pEditView; } - ProgressInfo* GetProgress() const { return pProgress; } + ExtTextEngine* GetEditEngine() const { return (ExtTextEngine*)pEditEngine; } + ExtTextView* GetEditView() const { return pEditView; } + ProgressInfo* GetProgress() const { return pProgress; } - void CreateProgress( const String& rText, ULONG nRange ); - void DestroyProgress(); + void CreateProgress( const String& rText, ULONG nRange ); + void DestroyProgress(); - void ParagraphInsertedDeleted( ULONG nNewPara, BOOL bInserted ); - void DoDelayedSyntaxHighlight( ULONG nPara ); + void ParagraphInsertedDeleted( ULONG nNewPara, BOOL bInserted ); + void DoDelayedSyntaxHighlight( ULONG nPara ); - void CreateEditEngine(); - void SetScrollBarRanges(); - void InitScrollBars(); - void SetModulWindow( ModulWindow* pWin ) + void CreateEditEngine(); + void SetScrollBarRanges(); + void InitScrollBars(); + void SetModulWindow( ModulWindow* pWin ) { pModulWindow = pWin; } - void ForceSyntaxTimeout(); - BOOL SetSourceInBasic( BOOL bQuiet = TRUE ); + void ForceSyntaxTimeout(); + BOOL SetSourceInBasic( BOOL bQuiet = TRUE ); - BOOL CanModify() { return ImpCanModify(); } + BOOL CanModify() { return ImpCanModify(); } }; class BreakPointWindow : public Window { private: - long nCurYOffset; - USHORT nMarkerPos; - BreakPointList aBreakPointList; - ModulWindow* pModulWindow; - BOOL bErrorMarker; + long nCurYOffset; + USHORT nMarkerPos; + BreakPointList aBreakPointList; + ModulWindow* pModulWindow; + BOOL bErrorMarker; bool m_bHighContrastMode; virtual void DataChanged(DataChangedEvent const & rDCEvt); @@ -199,27 +199,27 @@ private: void setBackgroundColor(Color aColor); protected: - virtual void Paint( const Rectangle& ); - virtual void Resize(); - BreakPoint* FindBreakPoint( const Point& rMousePos ); - void ShowMarker( BOOL bShow ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Command( const CommandEvent& rCEvt ); + virtual void Paint( const Rectangle& ); + virtual void Resize(); + BreakPoint* FindBreakPoint( const Point& rMousePos ); + void ShowMarker( BOOL bShow ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void Command( const CommandEvent& rCEvt ); - BOOL SyncYOffset(); + BOOL SyncYOffset(); public: BreakPointWindow( Window* pParent ); ~BreakPointWindow(); - void SetModulWindow( ModulWindow* pWin ) + void SetModulWindow( ModulWindow* pWin ) { pModulWindow = pWin; } - void SetMarkerPos( USHORT nLine, BOOL bErrorMarker = FALSE ); + void SetMarkerPos( USHORT nLine, BOOL bErrorMarker = FALSE ); - void DoScroll( long nHorzScroll, long nVertScroll ); - long& GetCurYOffset() { return nCurYOffset; } - BreakPointList& GetBreakPoints() { return aBreakPointList; } + void DoScroll( long nHorzScroll, long nVertScroll ); + long& GetCurYOffset() { return nCurYOffset; } + BreakPointList& GetBreakPoints() { return aBreakPointList; } }; @@ -228,31 +228,31 @@ class WatchTreeListBox : public SvHeaderTabListBox String aEditingRes; protected: - virtual BOOL EditingEntry( SvLBoxEntry* pEntry, Selection& rSel ); - virtual BOOL EditedEntry( SvLBoxEntry* pEntry, const String& rNewText ); + virtual BOOL EditingEntry( SvLBoxEntry* pEntry, Selection& rSel ); + virtual BOOL EditedEntry( SvLBoxEntry* pEntry, const String& rNewText ); - BOOL ImplBasicEntryEdited( SvLBoxEntry* pEntry, const String& rResult ); - SbxBase* ImplGetSBXForEntry( SvLBoxEntry* pEntry, bool& rbArrayElement ); + BOOL ImplBasicEntryEdited( SvLBoxEntry* pEntry, const String& rResult ); + SbxBase* ImplGetSBXForEntry( SvLBoxEntry* pEntry, bool& rbArrayElement ); -// virtual DragDropMode NotifyBeginDrag( SvLBoxEntry* ); -// virtual BOOL NotifyQueryDrop( SvLBoxEntry* ); +// virtual DragDropMode NotifyBeginDrag( SvLBoxEntry* ); +// virtual BOOL NotifyQueryDrop( SvLBoxEntry* ); -// virtual BOOL NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, -// SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos ); -// virtual BOOL NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, -// SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos ); -// BOOL NotifyCopyingMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, -// SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos, BOOL bMove ); +// virtual BOOL NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, +// SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos ); +// virtual BOOL NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, +// SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos ); +// BOOL NotifyCopyingMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, +// SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos, BOOL bMove ); public: WatchTreeListBox( Window* pParent, WinBits nWinBits ); ~WatchTreeListBox(); - void RequestingChilds( SvLBoxEntry * pParent ); - void UpdateWatches( bool bBasicStopped = false ); + void RequestingChilds( SvLBoxEntry * pParent ); + void UpdateWatches( bool bBasicStopped = false ); - using SvTabListBox::SetTabs; - virtual void SetTabs(); + using SvTabListBox::SetTabs; + virtual void SetTabs(); }; @@ -260,15 +260,15 @@ public: class WatchWindow : public BasicDockingWindow { private: - String aWatchStr; - ExtendedEdit aXEdit; - ImageButton aRemoveWatchButton; - WatchTreeListBox aTreeListBox; - HeaderBar aHeaderBar; + String aWatchStr; + ExtendedEdit aXEdit; + ImageButton aRemoveWatchButton; + WatchTreeListBox aTreeListBox; + HeaderBar aHeaderBar; protected: - virtual void Resize(); - virtual void Paint( const Rectangle& rRect ); + virtual void Resize(); + virtual void Paint( const Rectangle& rRect ); DECL_LINK( ButtonHdl, ImageButton * ); DECL_LINK( TreeListHdl, SvTreeListBox * ); @@ -280,57 +280,57 @@ public: WatchWindow( Window* pParent ); ~WatchWindow(); - void AddWatch( const String& rVName ); - BOOL RemoveSelectedWatch(); - void UpdateWatches( bool bBasicStopped = false ); + void AddWatch( const String& rVName ); + BOOL RemoveSelectedWatch(); + void UpdateWatches( bool bBasicStopped = false ); - WatchTreeListBox& GetWatchTreeListBox() { return aTreeListBox; } + WatchTreeListBox& GetWatchTreeListBox() { return aTreeListBox; } }; class StackWindow : public BasicDockingWindow { private: - SvTreeListBox aTreeListBox; - ImageButton aGotoCallButton; - String aStackStr; + SvTreeListBox aTreeListBox; + ImageButton aGotoCallButton; + String aStackStr; protected: - virtual void Resize(); - virtual void Paint( const Rectangle& rRect ); + virtual void Resize(); + virtual void Paint( const Rectangle& rRect ); DECL_LINK( ButtonHdl, ImageButton * ); public: StackWindow( Window* pParent ); ~StackWindow(); - void UpdateCalls(); + void UpdateCalls(); }; class ComplexEditorWindow : public Window { private: - BreakPointWindow aBrkWindow; - EditorWindow aEdtWindow; - ScrollBar aEWVScrollBar; + BreakPointWindow aBrkWindow; + EditorWindow aEdtWindow; + ScrollBar aEWVScrollBar; virtual void DataChanged(DataChangedEvent const & rDCEvt); protected: - virtual void Resize(); + virtual void Resize(); DECL_LINK( ScrollHdl, ScrollBar * ); public: ComplexEditorWindow( ModulWindow* pParent ); - BreakPointWindow& GetBrkWindow() { return aBrkWindow; } - EditorWindow& GetEdtWindow() { return aEdtWindow; } - ScrollBar& GetEWVScrollBar() { return aEWVScrollBar; } + BreakPointWindow& GetBrkWindow() { return aBrkWindow; } + EditorWindow& GetEdtWindow() { return aEdtWindow; } + ScrollBar& GetEWVScrollBar() { return aEWVScrollBar; } }; -#define SYNTAX_COLOR_MAX 5 +#define SYNTAX_COLOR_MAX 5 class ModulWindow: public IDEBaseWindow { @@ -338,32 +338,32 @@ class ModulWindow: public IDEBaseWindow private: StarBASICRef xBasic; - short nValid; + short nValid; ComplexEditorWindow aXEditorWindow; - BasicStatus aStatus; - SbModuleRef xModule; - ModulWindowLayout* pLayout; - String aCurPath; - ::rtl::OUString m_aModule; + BasicStatus aStatus; + SbModuleRef xModule; + ModulWindowLayout* pLayout; + String aCurPath; + ::rtl::OUString m_aModule; DECL_LINK( BasicErrorHdl, StarBASIC * ); - long BasicBreakHdl( StarBASIC* pBasic ); + long BasicBreakHdl( StarBASIC* pBasic ); - void CheckCompileBasic(); - BOOL BasicExecute(); + void CheckCompileBasic(); + BOOL BasicExecute(); - void GoOnTop(); - void AssertValidEditEngine(); + void GoOnTop(); + void AssertValidEditEngine(); sal_Int32 FormatAndPrint( Printer* pPrinter, sal_Int32 nPage = -1 ); - SbModuleRef XModule(); + SbModuleRef XModule(); protected: - virtual void Resize(); - virtual void GetFocus(); - virtual void Paint( const Rectangle& ); - virtual void Deactivating(); - virtual void DoInit(); - virtual void DoScroll( ScrollBar* pCurScrollBar ); + virtual void Resize(); + virtual void GetFocus(); + virtual void Paint( const Rectangle& ); + virtual void Deactivating(); + virtual void DoInit(); + virtual void DoScroll( ScrollBar* pCurScrollBar ); public: TYPEINFO(); @@ -373,93 +373,93 @@ public: ~ModulWindow(); - virtual void ExecuteCommand( SfxRequest& rReq ); - virtual void GetState( SfxItemSet& ); - virtual void StoreData(); - virtual void UpdateData(); - virtual BOOL CanClose(); - // virtual void PrintData( Printer* pPrinter ); + virtual void ExecuteCommand( SfxRequest& rReq ); + virtual void GetState( SfxItemSet& ); + virtual void StoreData(); + virtual void UpdateData(); + virtual BOOL CanClose(); + // virtual void PrintData( Printer* pPrinter ); // return number of pages to be printed virtual sal_Int32 countPages( Printer* pPrinter ); // print page virtual void printPage( sal_Int32 nPage, Printer* pPrinter ); - virtual String GetTitle(); + virtual String GetTitle(); virtual BasicEntryDescriptor CreateEntryDescriptor(); - virtual BOOL AllowUndo(); - virtual void SetReadOnly( BOOL bReadOnly ); + virtual BOOL AllowUndo(); + virtual void SetReadOnly( BOOL bReadOnly ); virtual BOOL IsReadOnly(); StarBASIC* GetBasic() { XModule(); return xBasic; } - SbModule* GetSbModule() { return xModule; } - void SetSbModule( SbModule* pModule ) { xModule = pModule; } - String GetSbModuleName(); + SbModule* GetSbModule() { return xModule; } + void SetSbModule( SbModule* pModule ) { xModule = pModule; } + String GetSbModuleName(); - BOOL CompileBasic(); - BOOL BasicRun(); - BOOL BasicStepOver(); - BOOL BasicStepInto(); - BOOL BasicStepOut(); - void BasicStop(); - BOOL BasicToggleBreakPoint(); - void BasicToggleBreakPointEnabled(); - void ManageBreakPoints(); - void UpdateBreakPoint( const BreakPoint& rBrk ); - void BasicAddWatch(); - void BasicRemoveWatch(); + BOOL CompileBasic(); + BOOL BasicRun(); + BOOL BasicStepOver(); + BOOL BasicStepInto(); + BOOL BasicStepOut(); + void BasicStop(); + BOOL BasicToggleBreakPoint(); + void BasicToggleBreakPointEnabled(); + void ManageBreakPoints(); + void UpdateBreakPoint( const BreakPoint& rBrk ); + void BasicAddWatch(); + void BasicRemoveWatch(); - BOOL LoadBasic(); - BOOL SaveBasicSource(); - BOOL ImportDialog(); + BOOL LoadBasic(); + BOOL SaveBasicSource(); + BOOL ImportDialog(); - void EditMacro( const String& rMacroName ); + void EditMacro( const String& rMacroName ); -// void InsertFromObjectCatalog( ObjectCatalog* pObjDlg ); +// void InsertFromObjectCatalog( ObjectCatalog* pObjDlg ); - BOOL ToggleBreakPoint( ULONG nLine ); + BOOL ToggleBreakPoint( ULONG nLine ); - BasicStatus& GetBasicStatus() { return aStatus; } + BasicStatus& GetBasicStatus() { return aStatus; } - virtual BOOL IsModified(); + virtual BOOL IsModified(); virtual BOOL IsPasteAllowed(); - void FrameWindowMoved(); - void ShowCursor( BOOL bOn ); + void FrameWindowMoved(); + void ShowCursor( BOOL bOn ); - virtual USHORT GetSearchOptions(); - USHORT StartSearchAndReplace( const SvxSearchItem& rSearchItem, BOOL bFromStart = FALSE ); + virtual USHORT GetSearchOptions(); + USHORT StartSearchAndReplace( const SvxSearchItem& rSearchItem, BOOL bFromStart = FALSE ); virtual Window* GetLayoutWindow(); - EditorWindow& GetEditorWindow() { return aXEditorWindow.GetEdtWindow(); } - BreakPointWindow& GetBreakPointWindow() { return aXEditorWindow.GetBrkWindow(); } - ScrollBar& GetEditVScrollBar() { return aXEditorWindow.GetEWVScrollBar(); } - ExtTextEngine* GetEditEngine() { return GetEditorWindow().GetEditEngine(); } - ExtTextView* GetEditView() { return GetEditorWindow().GetEditView(); } - BreakPointList& GetBreakPoints() { return GetBreakPointWindow().GetBreakPoints(); } - ModulWindowLayout* GetLayout() const { return pLayout; } + EditorWindow& GetEditorWindow() { return aXEditorWindow.GetEdtWindow(); } + BreakPointWindow& GetBreakPointWindow() { return aXEditorWindow.GetBrkWindow(); } + ScrollBar& GetEditVScrollBar() { return aXEditorWindow.GetEWVScrollBar(); } + ExtTextEngine* GetEditEngine() { return GetEditorWindow().GetEditEngine(); } + ExtTextView* GetEditView() { return GetEditorWindow().GetEditView(); } + BreakPointList& GetBreakPoints() { return GetBreakPointWindow().GetBreakPoints(); } + ModulWindowLayout* GetLayout() const { return pLayout; } - virtual void BasicStarted(); - virtual void BasicStopped(); + virtual void BasicStarted(); + virtual void BasicStopped(); - virtual SfxUndoManager* GetUndoManager(); + virtual SfxUndoManager* GetUndoManager(); - const ::rtl::OUString& GetModule() const { return m_aModule; } - void SetModule( const ::rtl::OUString& aModule ) { m_aModule = aModule; } + const ::rtl::OUString& GetModule() const { return m_aModule; } + void SetModule( const ::rtl::OUString& aModule ) { m_aModule = aModule; } }; class ModulWindowLayout: public Window, public utl::ConfigurationListener { private: - Splitter aVSplitter; - Splitter aHSplitter; + Splitter aVSplitter; + Splitter aHSplitter; - WatchWindow aWatchWindow; - StackWindow aStackWindow; + WatchWindow aWatchWindow; + StackWindow aStackWindow; - BOOL bVSplitted; - BOOL bHSplitted; + BOOL bVSplitted; + BOOL bHSplitted; ModulWindow * m_pModulWindow; @@ -480,21 +480,21 @@ private: void ArrangeWindows(); protected: - virtual void Resize(); - virtual void Paint( const Rectangle& rRect ); + virtual void Resize(); + virtual void Paint( const Rectangle& rRect ); public: ModulWindowLayout( Window* pParent ); ~ModulWindowLayout(); - void DockaWindow( DockingWindow* pDockingWin ); - BOOL IsToBeDocked( DockingWindow* pDockingWin, const Point& rPos, Rectangle& rRect ); + void DockaWindow( DockingWindow* pDockingWin ); + BOOL IsToBeDocked( DockingWindow* pDockingWin, const Point& rPos, Rectangle& rRect ); - void SetModulWindow( ModulWindow* pModWin ); - ModulWindow* GetModulWindow() const { return m_pModulWindow; } + void SetModulWindow( ModulWindow* pModWin ); + ModulWindow* GetModulWindow() const { return m_pModulWindow; } - WatchWindow& GetWatchWindow() { return aWatchWindow; } - StackWindow& GetStackWindow() { return aStackWindow; } + WatchWindow& GetWatchWindow() { return aWatchWindow; } + StackWindow& GetStackWindow() { return aStackWindow; } Image getImage(USHORT nId, bool bHighContrastMode) const; @@ -502,6 +502,6 @@ public: { return m_aSyntaxColors[eType]; } }; -#endif // _BASIDE2_HXX +#endif // _BASIDE2_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 2fa67b22fb48..d5745f23bd1d 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.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 @@ -67,13 +67,13 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -long nVirtToolBoxHeight; // wird im WatchWindow init., im Stackwindow verw. +long nVirtToolBoxHeight; // wird im WatchWindow init., im Stackwindow verw. long nHeaderBarHeight; -#define SCROLL_LINE 12 -#define SCROLL_PAGE 60 +#define SCROLL_LINE 12 +#define SCROLL_PAGE 60 -#define DWBORDER 3 +#define DWBORDER 3 static const char cSuffixes[] = "%&!#@$"; @@ -190,7 +190,7 @@ __EXPORT EditorWindow::~EditorWindow() { EndListening( *pEditEngine ); pEditEngine->RemoveView( pEditView ); -// pEditEngine->SetViewWin( 0 ); +// pEditEngine->SetViewWin( 0 ); delete pEditView; delete pEditEngine; } @@ -288,7 +288,7 @@ void __EXPORT EditorWindow::RequestHelp( const HelpEvent& rHEvt ) else if ( (BYTE)eType != (BYTE)SbxEMPTY ) { aHelpText = pVar->GetName(); - if ( !aHelpText.Len() ) // Bei Uebergabeparametern wird der Name nicht kopiert + if ( !aHelpText.Len() ) // Bei Uebergabeparametern wird der Name nicht kopiert aHelpText = aWord; aHelpText += '='; aHelpText += pVar->GetString(); @@ -320,7 +320,7 @@ void __EXPORT EditorWindow::Resize() if ( pEditView ) { long nVisY = pEditView->GetStartDocPos().Y(); -// pEditView->SetOutputArea( Rectangle( Point( 0, 0 ), GetOutputSize() ) ); +// pEditView->SetOutputArea( Rectangle( Point( 0, 0 ), GetOutputSize() ) ); pEditView->ShowCursor(); Size aOutSz( GetOutputSizePixel() ); long nMaxVisAreaStart = pEditView->GetTextEngine()->GetTextHeight() - aOutSz.Height(); @@ -406,7 +406,7 @@ BOOL EditorWindow::ImpCanModify() void __EXPORT EditorWindow::KeyInput( const KeyEvent& rKEvt ) { - if ( !pEditView ) // Passiert unter W95 bei letzte Version, Ctrl-Tab + if ( !pEditView ) // Passiert unter W95 bei letzte Version, Ctrl-Tab return; #if OSL_DEBUG_LEVEL > 1 @@ -471,7 +471,7 @@ void __EXPORT EditorWindow::KeyInput( const KeyEvent& rKEvt ) void __EXPORT EditorWindow::Paint( const Rectangle& rRect ) { - if ( !pEditEngine ) // spaetestens jetzt brauche ich sie... + if ( !pEditEngine ) // spaetestens jetzt brauche ich sie... CreateEditEngine(); pEditView->Paint( rRect ); @@ -489,7 +489,7 @@ BOOL EditorWindow::SetSourceInBasic( BOOL bQuiet ) BOOL bChanged = FALSE; if ( pEditEngine && pEditEngine->IsModified() - && !GetEditView()->IsReadOnly() ) // Added because of #i60626, otherwise + && !GetEditView()->IsReadOnly() ) // Added because of #i60626, otherwise // any read only bug in the text engine could lead to a crash later { if ( !StarBASIC::IsRunning() ) // Nicht zur Laufzeit! @@ -558,7 +558,7 @@ void EditorWindow::CreateEditEngine() aHighlighter.initialize( HIGHLIGHT_BASIC ); BOOL bWasDoSyntaxHighlight = bDoSyntaxHighlight; - bDoSyntaxHighlight = FALSE; // Bei grossen Texten zu langsam... + bDoSyntaxHighlight = FALSE; // Bei grossen Texten zu langsam... ::rtl::OUString aOUSource( pModulWindow->GetModule() ); sal_Int32 nLines = 0; sal_Int32 nIndex = -1; @@ -579,7 +579,7 @@ void EditorWindow::CreateEditEngine() pEditView->SetSelection( TextSelection() ); pModulWindow->GetBreakPointWindow().GetCurYOffset() = 0; pEditEngine->SetUpdateMode( TRUE ); - Update(); // Es wurde bei UpdateMode = TRUE nur Invalidiert + Update(); // Es wurde bei UpdateMode = TRUE nur Invalidiert // Die anderen Fenster auch, damit keine halben Sachen auf dem Bildschirm! pModulWindow->GetLayout()->GetWatchWindow().Update(); @@ -957,7 +957,7 @@ __EXPORT BreakPointWindow::~BreakPointWindow() void __EXPORT BreakPointWindow::Resize() { -/// Invalidate(); +/// Invalidate(); } @@ -1006,10 +1006,10 @@ void BreakPointWindow::SetMarkerPos( USHORT nLine, BOOL bError ) if ( SyncYOffset() ) Update(); - ShowMarker( FALSE ); // Alten wegzeichen... + ShowMarker( FALSE ); // Alten wegzeichen... nMarkerPos = nLine; bErrorMarker = bError; - ShowMarker( TRUE ); // Neuen zeichnen... + ShowMarker( TRUE ); // Neuen zeichnen... } void BreakPointWindow::ShowMarker( BOOL bShow ) @@ -1043,13 +1043,13 @@ void BreakPointWindow::ShowMarker( BOOL bShow ) -BreakPoint* BreakPointWindow::FindBreakPoint( const Point& rMousePos ) +BreakPoint* BreakPointWindow::FindBreakPoint( const Point& rMousePos ) { long nLineHeight = GetTextHeight(); long nYPos = rMousePos.Y() + nCurYOffset; -// Image aBrk( ((ModulWindowLayout*)pModulWindow->GetLayoutWindow())->GetImage( IMGID_BRKENABLED ) ); -// Size aBmpSz( aBrk.GetSizePixel() ); -// aBmpSz = PixelToLogic( aBmpSz ); +// Image aBrk( ((ModulWindowLayout*)pModulWindow->GetLayoutWindow())->GetImage( IMGID_BRKENABLED ) ); +// Size aBmpSz( aBrk.GetSizePixel() ); +// aBmpSz = PixelToLogic( aBmpSz ); BreakPoint* pBrk = GetBreakPoints().First(); while ( pBrk ) @@ -1263,7 +1263,7 @@ void __EXPORT WatchWindow::Resize() Size aSz = GetOutputSizePixel(); Size aBoxSz( aSz.Width() - 2*DWBORDER, aSz.Height() - nVirtToolBoxHeight - DWBORDER ); - if ( aBoxSz.Width() < 4 ) // < 4, weil noch Border... + if ( aBoxSz.Width() < 4 ) // < 4, weil noch Border... aBoxSz.Width() = 0; if ( aBoxSz.Height() < 4 ) aBoxSz.Height() = 0; @@ -1275,13 +1275,13 @@ void __EXPORT WatchWindow::Resize() aBoxSz.Height() = nHeaderBarHeight; aHeaderBar.SetSizePixel( aBoxSz ); - Invalidate(); //Wegen DrawLine im Paint... + Invalidate(); //Wegen DrawLine im Paint... } struct MemberList { - String* mpMemberNames; - int mnMemberCount; + String* mpMemberNames; + int mnMemberCount; MemberList( void ) : mpMemberNames( NULL ) @@ -1320,14 +1320,14 @@ struct WatchItem String maName; String maDisplayName; SbxObjectRef mpObject; - MemberList maMemberList; + MemberList maMemberList; - SbxDimArrayRef mpArray; - int nDimLevel; // 0 = Root - int nDimCount; - short* pIndices; + SbxDimArrayRef mpArray; + int nDimLevel; // 0 = Root + int nDimCount; + short* pIndices; - WatchItem* mpArrayParentItem; + WatchItem* mpArrayParentItem; WatchItem( void ) : nDimLevel( 0 ) @@ -1535,7 +1535,7 @@ StackWindow::StackWindow( Window* pParent ) : aSz.Width() += 6; aSz.Height() += 6; aGotoCallButton.SetSizePixel( aSz ); -// aGotoCallButton.Show(); // wird vom Basic noch nicht unterstuetzt! +// aGotoCallButton.Show(); // wird vom Basic noch nicht unterstuetzt! aGotoCallButton.Hide(); // make stack window keyboard accessible @@ -1564,14 +1564,14 @@ void __EXPORT StackWindow::Resize() Size aSz = GetOutputSizePixel(); Size aBoxSz( aSz.Width() - 2*DWBORDER, aSz.Height() - nVirtToolBoxHeight - DWBORDER ); - if ( aBoxSz.Width() < 4 ) // < 4, weil noch Border... + if ( aBoxSz.Width() < 4 ) // < 4, weil noch Border... aBoxSz.Width() = 0; if ( aBoxSz.Height() < 4 ) aBoxSz.Height() = 0; aTreeListBox.SetSizePixel( aBoxSz ); - Invalidate(); //Wegen DrawLine im Paint... + Invalidate(); //Wegen DrawLine im Paint... } @@ -1699,9 +1699,9 @@ void __EXPORT ComplexEditorWindow::Resize() aEWVScrollBar.SetPosSizePixel( Point( aOutSz.Width()-DWBORDER-nSBWidth, DWBORDER ), Size( nSBWidth, aSz.Height() ) ); // Macht das EditorWindow, ausserdem hier falsch, da Pixel -// aEWVScrollBar.SetPageSize( aEWSz.Height() * 8 / 10 ); -// aEWVScrollBar.SetVisibleSize( aSz.Height() ); -// Invalidate(); +// aEWVScrollBar.SetPageSize( aEWSz.Height() * 8 / 10 ); +// aEWVScrollBar.SetVisibleSize( aSz.Height() ); +// Invalidate(); } IMPL_LINK( ComplexEditorWindow, ScrollHdl, ScrollBar *, pCurScrollBar ) @@ -2052,7 +2052,7 @@ static void implCollapseModifiedObjectEntry( SvLBoxEntry* pParent, WatchTreeList { pThis->Collapse( pParent ); - SvLBoxTreeList* pModel = pThis->GetModel(); + SvLBoxTreeList* pModel = pThis->GetModel(); SvLBoxEntry* pDeleteEntry; while( (pDeleteEntry = pThis->SvTreeListBox::GetEntry( pParent, 0 )) != NULL ) { diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 244440823169..df0b7dbf46b4 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.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 @@ #include <vector> #include <basidesh.hrc> #include <baside3.hxx> -#include <localizationmgr.hxx> +#include <localizationmgr.hxx> #include <accessibledialogwindow.hxx> #include <dlged.hxx> #include <dlgedmod.hxx> @@ -84,12 +84,12 @@ #include <com/sun/star/script/vba/XVBACompatibility.hpp> using namespace comphelper; -using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::ucb; -using namespace ::com::sun::star::io; -using namespace ::com::sun::star::resource; -using namespace ::com::sun::star::ui::dialogs; +using namespace ::com::sun::star; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::ucb; +using namespace ::com::sun::star::io; +using namespace ::com::sun::star::resource; +using namespace ::com::sun::star::ui::dialogs; #if defined(MAC) #define FILTERMASK_ALL "****" @@ -129,7 +129,7 @@ DialogWindow::DialogWindow( Window* pParent, const ScriptDocument& rDocument, St // set readonly mode for readonly libraries ::rtl::OUString aOULibName( aLibName ); Reference< script::XLibraryContainer2 > xDlgLibContainer( GetDocument().getLibraryContainer( E_DIALOGS ), UNO_QUERY ); - if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOULibName ) && xDlgLibContainer->isLibraryReadOnly( aOULibName ) ) + if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOULibName ) && xDlgLibContainer->isLibraryReadOnly( aOULibName ) ) SetReadOnly( TRUE ); if ( rDocument.isDocument() && rDocument.isReadOnly() ) @@ -259,10 +259,10 @@ void DialogWindow::Command( const CommandEvent& rCEvt ) { pDispatcher->ExecutePopup( IDEResId(RID_POPUP_DLGED) ); } - + } } - else + else IDEBaseWindow::Command( rCEvt ); } @@ -383,21 +383,21 @@ void __EXPORT DialogWindow::GetState( SfxItemSet& rSet ) case OBJ_DLG_GROUPBOX: nObj = SVX_SNAP_GROUPBOX; break; case OBJ_DLG_EDIT: nObj = SVX_SNAP_EDIT; break; case OBJ_DLG_FIXEDTEXT: nObj = SVX_SNAP_FIXEDTEXT; break; - case OBJ_DLG_IMAGECONTROL: nObj = SVX_SNAP_IMAGECONTROL; break; - case OBJ_DLG_PROGRESSBAR: nObj = SVX_SNAP_PROGRESSBAR; break; + case OBJ_DLG_IMAGECONTROL: nObj = SVX_SNAP_IMAGECONTROL; break; + case OBJ_DLG_PROGRESSBAR: nObj = SVX_SNAP_PROGRESSBAR; break; case OBJ_DLG_HSCROLLBAR: nObj = SVX_SNAP_HSCROLLBAR; break; case OBJ_DLG_VSCROLLBAR: nObj = SVX_SNAP_VSCROLLBAR; break; - case OBJ_DLG_HFIXEDLINE: nObj = SVX_SNAP_HFIXEDLINE; break; - case OBJ_DLG_VFIXEDLINE: nObj = SVX_SNAP_VFIXEDLINE; break; - case OBJ_DLG_DATEFIELD: nObj = SVX_SNAP_DATEFIELD; break; - case OBJ_DLG_TIMEFIELD: nObj = SVX_SNAP_TIMEFIELD; break; - case OBJ_DLG_NUMERICFIELD: nObj = SVX_SNAP_NUMERICFIELD; break; - case OBJ_DLG_CURRENCYFIELD: nObj = SVX_SNAP_CURRENCYFIELD; break; - case OBJ_DLG_FORMATTEDFIELD: nObj = SVX_SNAP_FORMATTEDFIELD; break; - case OBJ_DLG_PATTERNFIELD: nObj = SVX_SNAP_PATTERNFIELD; break; - case OBJ_DLG_FILECONTROL: nObj = SVX_SNAP_FILECONTROL; break; - case OBJ_DLG_TREECONTROL: nObj = SVX_SNAP_TREECONTROL; break; - default: nObj = 0; + case OBJ_DLG_HFIXEDLINE: nObj = SVX_SNAP_HFIXEDLINE; break; + case OBJ_DLG_VFIXEDLINE: nObj = SVX_SNAP_VFIXEDLINE; break; + case OBJ_DLG_DATEFIELD: nObj = SVX_SNAP_DATEFIELD; break; + case OBJ_DLG_TIMEFIELD: nObj = SVX_SNAP_TIMEFIELD; break; + case OBJ_DLG_NUMERICFIELD: nObj = SVX_SNAP_NUMERICFIELD; break; + case OBJ_DLG_CURRENCYFIELD: nObj = SVX_SNAP_CURRENCYFIELD; break; + case OBJ_DLG_FORMATTEDFIELD: nObj = SVX_SNAP_FORMATTEDFIELD; break; + case OBJ_DLG_PATTERNFIELD: nObj = SVX_SNAP_PATTERNFIELD; break; + case OBJ_DLG_FILECONTROL: nObj = SVX_SNAP_FILECONTROL; break; + case OBJ_DLG_TREECONTROL: nObj = SVX_SNAP_TREECONTROL; break; + default: nObj = 0; } #ifdef DBG_UTIL if( !nObj ) @@ -416,7 +416,7 @@ void __EXPORT DialogWindow::GetState( SfxItemSet& rSet ) case SID_SHOW_PROPERTYBROWSER: { BasicIDEShell* pIDEShell = IDE_DLL()->GetShell(); - SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL; + SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL; if ( pViewFrame && !pViewFrame->HasChildWindow( SID_SHOW_PROPERTYBROWSER ) && !pEditor->GetView()->AreObjectsMarked() ) rSet.DisableItem( nWh ); @@ -647,7 +647,7 @@ void __EXPORT DialogWindow::ExecuteCommand( SfxRequest& rReq ) rReq.Done(); } -Reference< container::XNameContainer > DialogWindow::GetDialog() const +Reference< container::XNameContainer > DialogWindow::GetDialog() const { return pEditor->GetDialog(); } @@ -733,16 +733,16 @@ BOOL DialogWindow::SaveDialog() Reference< XSimpleFileAccess > xSFI( xMSF->createInstance ( ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), UNO_QUERY ); - + Reference< XOutputStream > xOutput; try { if( xSFI->exists( aCurPath ) ) xSFI->kill( aCurPath ); - xOutput = xSFI->openFileWrite( aCurPath ); + xOutput = xSFI->openFileWrite( aCurPath ); } catch( Exception& ) - {} + {} if( xOutput.is() ) { @@ -790,7 +790,7 @@ BOOL DialogWindow::SaveDialog() aURLObj.removeSegment(); ::rtl::OUString aURL( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) ); sal_Bool bReadOnly = sal_False; - ::rtl::OUString aComment( ::rtl::OUString::createFromAscii( "# " ) ); + ::rtl::OUString aComment( ::rtl::OUString::createFromAscii( "# " ) ); aComment += aDialogName; aComment += ::rtl::OUString::createFromAscii( " strings" ); Reference< task::XInteractionHandler > xDummyHandler; @@ -833,9 +833,9 @@ BOOL DialogWindow::SaveDialog() } } } - + Reference< XStringResourceWithLocation > xStringResourceWithLocation = - StringResourceWithLocation::create( xContext, aURL, bReadOnly, + StringResourceWithLocation::create( xContext, aURL, bReadOnly, xStringResourceResolver->getDefaultLocale(), aDialogName, aComment, xDummyHandler ); // Add locales @@ -896,7 +896,7 @@ std::vector< lang::Locale > implGetLanguagesOnlyContainedInFirstSeq if( !bAlsoContainedInSecondSeq ) avRet.push_back( rFirstLocale ); } - + return avRet; } @@ -1001,10 +1001,10 @@ BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocumen Reference< XSimpleFileAccess > xSFI( xMSF->createInstance ( ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), UNO_QUERY_THROW ); - + Reference< XInputStream > xInput; if( xSFI->exists( aCurPath ) ) - xInput = xSFI->openFileRead( aCurPath ); + xInput = xSFI->openFileRead( aCurPath ); Reference< XComponentContext > xContext; Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY ); @@ -1045,7 +1045,7 @@ BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocumen { String aQueryBoxTitle( IDEResId( RID_STR_DLGIMP_CLASH_TITLE ) ); String aQueryBoxText( IDEResId( RID_STR_DLGIMP_CLASH_TEXT ) ); - aQueryBoxText.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "$(ARG1)" ) ), aXmlDlgName ); + aQueryBoxText.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "$(ARG1)" ) ), aXmlDlgName ); NameClashQueryBox aQueryBox( pWin, aQueryBoxTitle, aQueryBoxText ); USHORT nRet = aQueryBox.Execute(); @@ -1066,7 +1066,7 @@ BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocumen return bDone; } } - + BasicIDEShell* pIDEShell = IDE_DLL()->GetShell(); if( pIDEShell == NULL ) { @@ -1079,7 +1079,7 @@ BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocumen Reference< task::XInteractionHandler > xDummyHandler; bool bReadOnly = true; Reference< XStringResourceWithLocation > xImportStringResource = - StringResourceWithLocation::create( xContext, aBasePath, bReadOnly, + StringResourceWithLocation::create( xContext, aBasePath, bReadOnly, aLocale, aXmlDlgName, ::rtl::OUString(), xDummyHandler ); Sequence< lang::Locale > aImportLocaleSeq = xImportStringResource->getLocales(); @@ -1247,7 +1247,7 @@ BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocumen bDone = TRUE; } catch( Exception& ) - {} + {} } return bDone; @@ -1265,7 +1265,7 @@ BOOL DialogWindow::ImportDialog() DlgEdModel* DialogWindow::GetModel() const { - return pEditor ? pEditor->GetModel() : NULL; + return pEditor ? pEditor->GetModel() : NULL; } DlgEdPage* DialogWindow::GetPage() const @@ -1329,7 +1329,7 @@ BOOL DialogWindow::IsPasteAllowed() } void DialogWindow::StoreData() -{ +{ if ( IsModified() ) { try @@ -1339,7 +1339,7 @@ void DialogWindow::StoreData() if( xLib.is() ) { Reference< container::XNameContainer > xDialogModel = pEditor->GetDialog(); - + if( xDialogModel.is() ) { Reference< XComponentContext > xContext; diff --git a/basctl/source/basicide/basidectrlr.cxx b/basctl/source/basicide/basidectrlr.cxx index 9bce6c13c294..9b32530c13f3 100644 --- a/basctl/source/basicide/basidectrlr.cxx +++ b/basctl/source/basicide/basidectrlr.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 @@ -68,7 +68,7 @@ BasicIDEController::~BasicIDEController() //---------------------------------------------------------------------------- Any SAL_CALL BasicIDEController::queryInterface( const Type & rType ) throw(RuntimeException) -{ +{ Any aReturn = SfxBaseController::queryInterface( rType ); if ( !aReturn.hasValue() ) aReturn = OPropertyContainer::queryInterface( rType ); diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index 80928ca87ec5..8e83ec9df94c 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.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 @@ -83,7 +83,7 @@ using namespace ::com::sun::star::frame; class SvxSearchItem; -// Egal was, einfach ans aktuelle Fenster: +// Egal was, einfach ans aktuelle Fenster: void __EXPORT BasicIDEShell::ExecuteCurrent( SfxRequest& rReq ) { if ( !pCurWin ) @@ -226,9 +226,9 @@ void __EXPORT BasicIDEShell::ExecuteCurrent( SfxRequest& rReq ) if ( pWin && ( pWin != pCurWin ) ) pWin = aIDEWindowTable.Next(); else - pWin = 0; // Dann sind wir durch... + pWin = 0; // Dann sind wir durch... } - if ( !nFound && bSearchedFromStart ) // Aktuelles von vorne... + if ( !nFound && bSearchedFromStart ) // Aktuelles von vorne... nFound = ((ModulWindow*)pCurWin)->StartSearchAndReplace( (const SvxSearchItem&)rItem, TRUE ); if ( bChangeCurWindow ) SetCurWindow( pWin, TRUE ); @@ -264,7 +264,7 @@ void __EXPORT BasicIDEShell::ExecuteCurrent( SfxRequest& rReq ) } } -// Egal, wer oben, Einfluss auf die Shell: +// Egal, wer oben, Einfluss auf die Shell: void __EXPORT BasicIDEShell::ExecuteGlobal( SfxRequest& rReq ) { USHORT nSlot = rReq.GetSlot(); @@ -438,7 +438,7 @@ void __EXPORT BasicIDEShell::ExecuteGlobal( SfxRequest& rReq ) ModulWindow* pModWin = (ModulWindow*)pWin; String aLibName = ( pModWin->GetLibName() ); ScriptDocument aDocument( pWin->GetDocument() ); - + if ( BasicIDE::RenameModule( pModWin, aDocument, aLibName, aOldName, aNewName ) ) { bRenameOk = true; @@ -447,14 +447,14 @@ void __EXPORT BasicIDEShell::ExecuteGlobal( SfxRequest& rReq ) // pWin has been invalidated, restore now pWin = FindBasWin( aDocument, aLibName, aNewName, TRUE ); } - + } - else if ( pWin->IsA( TYPE( DialogWindow ) ) ) + else if ( pWin->IsA( TYPE( DialogWindow ) ) ) { DialogWindow* pDlgWin = (DialogWindow*)pWin; bRenameOk = pDlgWin->RenameDialog( aNewName ); } - if ( bRenameOk ) + if ( bRenameOk ) { BasicIDE::MarkDocumentModified( pWin->GetDocument() ); } @@ -566,7 +566,7 @@ void __EXPORT BasicIDEShell::ExecuteGlobal( SfxRequest& rReq ) } } } - else // Loaded... + else // Loaded... UpdateWindows(); } break; @@ -974,7 +974,7 @@ void __EXPORT BasicIDEShell::GetState(SfxItemSet &rSet) case SID_UNDO: case SID_REDO: { - if( GetUndoManager() ) // sonst rekursives GetState + if( GetUndoManager() ) // sonst rekursives GetState GetViewFrame()->GetSlotState( nWh, NULL, &rSet ); } break; @@ -1070,7 +1070,7 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, BOOL bUpdateTabBar, BO { pPrevCurWin->Hide(); pPrevCurWin->Deactivating(); -// pPrevCurWin->GetLayoutWindow()->Hide(); +// pPrevCurWin->GetLayoutWindow()->Hide(); if( pPrevCurWin->IsA( TYPE( DialogWindow ) ) ) { ((DialogWindow*)pPrevCurWin)->DisableBrowser(); @@ -1117,7 +1117,7 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, BOOL bUpdateTabBar, BO Window* pFocusWindow = Application::GetFocusWindow(); while ( pFocusWindow && ( pFocusWindow != pFrameWindow ) ) pFocusWindow = pFocusWindow->GetParent(); - if ( pFocusWindow ) // Focus in BasicIDE + if ( pFocusWindow ) // Focus in BasicIDE pNewWin->GrabFocus(); } if( pCurWin->IsA( TYPE( DialogWindow ) ) ) @@ -1127,10 +1127,10 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, BOOL bUpdateTabBar, BO { ULONG nKey = aIDEWindowTable.GetKey( pCurWin ); if ( pCurWin && ( pTabBar->GetPagePos( (USHORT)nKey ) == TAB_PAGE_NOTFOUND ) ) - pTabBar->InsertPage( (USHORT)nKey, pCurWin->GetTitle() ); // wurde neu eingeblendet + pTabBar->InsertPage( (USHORT)nKey, pCurWin->GetTitle() ); // wurde neu eingeblendet pTabBar->SetCurPageId( (USHORT)nKey ); } - if ( pCurWin && pCurWin->IsSuspended() ) // Wenn das Fenster im Fehlerfall angezeigt wird... + if ( pCurWin && pCurWin->IsSuspended() ) // Wenn das Fenster im Fehlerfall angezeigt wird... pCurWin->SetStatus( pCurWin->GetStatus() & ~BASWIN_SUSPENDED ); if ( pCurWin ) { @@ -1253,7 +1253,7 @@ long BasicIDEShell::CallBasicBreakHdl( StarBASIC* pBasic ) nRet = pModWin->BasicBreakHdl( pBasic ); - if ( StarBASIC::IsRunning() ) // Falls abgebrochen... + if ( StarBASIC::IsRunning() ) // Falls abgebrochen... { if ( bAppWindowDisabled ) Application::GetDefDialogParent()->Enable( FALSE ); @@ -1316,7 +1316,7 @@ void __EXPORT BasicIDEShell::AdjustPosSizePixel( const Point &rPos, const Size & return; Size aSz( rSize ); -// long nScrollbarWidthPixel = aVScrollBar.GetSizePixel().Width(); +// long nScrollbarWidthPixel = aVScrollBar.GetSizePixel().Width(); Size aScrollBarBoxSz( aScrollBarBox.GetSizePixel() ); aSz.Height() -= aScrollBarBoxSz.Height(); @@ -1345,7 +1345,7 @@ void __EXPORT BasicIDEShell::AdjustPosSizePixel( const Point &rPos, const Size & if ( pEdtWin ) { if( pCurWin && pCurWin->IsA( TYPE( DialogWindow ) ) ) - pEdtWin->SetPosSizePixel( rPos, aSz ); // Ohne ScrollBar + pEdtWin->SetPosSizePixel( rPos, aSz ); // Ohne ScrollBar else pEdtWin->SetPosSizePixel( rPos, aOutSz ); } @@ -1435,7 +1435,7 @@ IMPL_LINK( BasicIDEShell, AccelSelectHdl, Accelerator*, pAccel ) else pDispatcher->Execute( SID_BASICIDE_TOGGLEBRKPNT, SFX_CALLMODE_SYNCHRON ); break; - default: bDone = FALSE; + default: bDone = FALSE; } return bDone; } diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx index 4092529a5e17..725d8cb85c73 100644 --- a/basctl/source/basicide/basides2.cxx +++ b/basctl/source/basicide/basides2.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 @@ -197,7 +197,7 @@ void BasicIDEShell::SetMDITitle() pShell->SetTitle( aTitle ); pShell->SetModified( FALSE ); } - + css::uno::Reference< css::frame::XController > xController = GetController (); css::uno::Reference< css::frame::XTitle > xTitle (xController, css::uno::UNO_QUERY); if (xTitle.is ()) @@ -260,7 +260,7 @@ ModulWindow* BasicIDEShell::CreateBasWin( const ScriptDocument& rDocument, const { pWin = FindBasWin( rDocument, aLibName, aModName, FALSE, TRUE ); if( !pWin ) - { + { // new module window pWin = new ModulWindow( pModulLayout, rDocument, aLibName, aModName, aModule ); nKey = InsertWindowInTable( pWin ); @@ -310,7 +310,7 @@ ModulWindow* BasicIDEShell::FindBasWin( const ScriptDocument& rDocument, const S { if ( ( !pWin->IsSuspended() || bFindSuspended ) && pWin->IsA( TYPE( ModulWindow ) ) ) { - if ( !rLibName.Len() ) // nur irgendeins finden... + if ( !rLibName.Len() ) // nur irgendeins finden... pModWin = (ModulWindow*)pWin; else if ( pWin->IsDocument( rDocument ) && pWin->GetLibName() == rLibName && pWin->GetName() == rModName ) pModWin = (ModulWindow*)pWin; diff --git a/basctl/source/basicide/basides3.cxx b/basctl/source/basicide/basides3.cxx index 3825eaef11bf..aba47effc61b 100644 --- a/basctl/source/basicide/basides3.cxx +++ b/basctl/source/basicide/basides3.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,7 +42,7 @@ #include <baside2.hxx> #include <baside3.hxx> #include <basobj.hxx> -#include <localizationmgr.hxx> +#include <localizationmgr.hxx> #include <dlgedview.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/script/XLibraryContainer.hpp> @@ -59,7 +59,7 @@ using namespace ::com::sun::star::io; DialogWindow* BasicIDEShell::CreateDlgWin( const ScriptDocument& rDocument, const String& rLibName, const String& rDlgName ) { bCreatingWindow = TRUE; - + ULONG nKey = 0; DialogWindow* pWin = 0; String aLibName( rLibName ); @@ -80,7 +80,7 @@ DialogWindow* BasicIDEShell::CreateDlgWin( const ScriptDocument& rDocument, cons { try { - Reference< io::XInputStreamProvider > xISP; + Reference< io::XInputStreamProvider > xISP; if ( rDocument.hasDialog( aLibName, aDlgName ) ) rDocument.getDialog( aLibName, aDlgName, xISP ); else @@ -108,7 +108,7 @@ DialogWindow* BasicIDEShell::CreateDlgWin( const ScriptDocument& rDocument, cons catch ( uno::Exception& ) { DBG_UNHANDLED_EXCEPTION(); - } + } } else { @@ -144,7 +144,7 @@ DialogWindow* BasicIDEShell::FindDlgWin( const ScriptDocument& rDocument, const { if ( ( !pWin->IsSuspended() || bFindSuspended ) && pWin->IsA( TYPE( DialogWindow ) ) ) { - if ( !rLibName.Len() ) // nur irgendeins finden... + if ( !rLibName.Len() ) // nur irgendeins finden... pDlgWin = (DialogWindow*)pWin; else if ( pWin->IsDocument( rDocument ) && pWin->GetLibName() == rLibName && pWin->GetName() == rDlgName ) pDlgWin = (DialogWindow*)pWin; diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 9b5d01636047..e434d1cb9a11 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.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,7 +42,7 @@ #define SI_NOCONTROL #define SI_NOSBXCONTROLS -#define ITEMID_SIZE 0 +#define ITEMID_SIZE 0 // Falls ohne PCH's: #include <ide_pch.hxx> @@ -99,7 +99,7 @@ public: ContainerListenerImpl( BasicIDEShell* pShell ) : mpShell( pShell ) {} - ~ContainerListenerImpl() + ~ContainerListenerImpl() { } @@ -173,7 +173,7 @@ SFX_IMPL_INTERFACE( BasicIDEShell, SfxViewShell, IDEResId( RID_STR_IDENAME ) ) -#define IDE_VIEWSHELL_FLAGS SFX_VIEW_CAN_PRINT|SFX_VIEW_NO_NEWWINDOW +#define IDE_VIEWSHELL_FLAGS SFX_VIEW_CAN_PRINT|SFX_VIEW_NO_NEWWINDOW // Hack for #101048 @@ -287,7 +287,7 @@ __EXPORT BasicIDEShell::~BasicIDEShell() // Destroy all ContainerListeners for Basic Container. if ( pListener ) pListener->removeContainerListener( m_aCurDocument, m_aCurLibName ); - + // MI: Das gab einen GPF im SDT beim Schliessen da dann der ViewFrame die // ObjSh loslaesst. Es wusste auch keiner mehr wozu das gut war. // GetViewFrame()->GetObjectShell()->Broadcast( SfxSimpleHint( SFX_HINT_DYING ) ); @@ -434,7 +434,7 @@ USHORT __EXPORT BasicIDEShell::PrepareClose( BOOL bUI, BOOL bForBrowsing ) else { // Hier unguenstig, wird zweimal gerufen... -// StoreAllWindowData(); +// StoreAllWindowData(); BOOL bCanClose = TRUE; for ( ULONG nWin = 0; bCanClose && ( nWin < aIDEWindowTable.Count() ); nWin++ ) @@ -450,7 +450,7 @@ USHORT __EXPORT BasicIDEShell::PrepareClose( BOOL bUI, BOOL bForBrowsing ) } if ( bCanClose ) - StoreAllWindowData( FALSE ); // Nicht auf Platte schreiben, das passiert am Ende automatisch + StoreAllWindowData( FALSE ); // Nicht auf Platte schreiben, das passiert am Ende automatisch return bCanClose; } @@ -634,7 +634,7 @@ void __EXPORT BasicIDEShell::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId&, { SbxHint& rSbxHint = (SbxHint&)rHint; ULONG nHintId = rSbxHint.GetId(); - if ( ( nHintId == SBX_HINT_BASICSTART ) || + if ( ( nHintId == SBX_HINT_BASICSTART ) || ( nHintId == SBX_HINT_BASICSTOP ) ) { SfxBindings* pBindings = BasicIDE::GetBindingsPtr(); @@ -920,7 +920,7 @@ void BasicIDEShell::RemoveWindow( IDEBaseWindow* pWindow_, BOOL bDestroy, BOOL b // Es kommt kein Notify... pWindow_->BasicStopped(); } - aIDEWindowTable.Insert( nKey, pWindow_ ); // wieder einhaegen + aIDEWindowTable.Insert( nKey, pWindow_ ); // wieder einhaegen } } else @@ -928,7 +928,7 @@ void BasicIDEShell::RemoveWindow( IDEBaseWindow* pWindow_, BOOL bDestroy, BOOL b pWindow_->Hide(); pWindow_->AddStatus( BASWIN_SUSPENDED ); pWindow_->Deactivating(); - aIDEWindowTable.Insert( nKey, pWindow_ ); // wieder einhaegen + aIDEWindowTable.Insert( nKey, pWindow_ ); // wieder einhaegen } } @@ -1013,7 +1013,7 @@ void BasicIDEShell::SetCurLib( const ScriptDocument& rDocument, String aLibName, pListener->removeContainerListener( m_aCurDocument, m_aCurLibName ); m_aCurDocument = rDocument; - + pListener->addContainerListener( m_aCurDocument, aLibName ); m_aCurLibName = aLibName; diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src index 556211f690af..25c8c460d282 100644 --- a/basctl/source/basicide/basidesh.src +++ b/basctl/source/basicide/basidesh.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 @@ -32,7 +32,7 @@ #endif #include "dlgresid.hrc" -#define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; }; +#define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; }; String RID_STR_IDENAME { @@ -702,12 +702,12 @@ String RID_STR_DLGIMP_MISMATCH_TEXT #define MN_HELP 31 #define MN_TEMPLATES 11 -#define MN_PLEDIT 20 -#define MN_PLVIEW 21 -#define MN_PLEXTRA 22 -#define MN_PLWIN 30 -#define MN_PLHELP 31 -#define MN_PLTEMPLATES 11 +#define MN_PLEDIT 20 +#define MN_PLVIEW 21 +#define MN_PLEXTRA 22 +#define MN_PLWIN 30 +#define MN_PLHELP 31 +#define MN_PLTEMPLATES 11 /* diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index a5b441cdb1ab..b60ad4b6019c 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.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 @@ -103,7 +103,7 @@ BOOL IsValidSbxName( const String& rName ) { for ( USHORT nChar = 0; nChar < rName.Len(); nChar++ ) { - BOOL bValid = ( ( rName.GetChar(nChar) >= 'A' && rName.GetChar(nChar) <= 'Z' ) || + BOOL bValid = ( ( rName.GetChar(nChar) >= 'A' && rName.GetChar(nChar) <= 'Z' ) || ( rName.GetChar(nChar) >= 'a' && rName.GetChar(nChar) <= 'z' ) || ( rName.GetChar(nChar) >= '0' && rName.GetChar(nChar) <= '9' && nChar ) || ( rName.GetChar(nChar) == '_' ) ); @@ -207,7 +207,7 @@ bool RenameModule( Window* pErrorParent, const ScriptDocument& rDocument, const DBG_ASSERT( nId, "No entry in Tabbar!" ); if ( nId ) { - BasicIDETabBar* pTabBar = (BasicIDETabBar*)pIDEShell->GetTabBar(); + BasicIDETabBar* pTabBar = (BasicIDETabBar*)pIDEShell->GetTabBar(); pTabBar->SetPageText( nId, rNewName ); pTabBar->Sort(); pTabBar->MakeVisible( pTabBar->GetCurPageId() ); @@ -337,7 +337,7 @@ bool RenameModule( Window* pErrorParent, const ScriptDocument& rDocument, const if ( pMethod && !rxLimitToDocument.is() ) { - pMethod->AddRef(); // festhalten, bis Event abgearbeitet. + pMethod->AddRef(); // festhalten, bis Event abgearbeitet. Application::PostUserEvent( LINK( IDE_DLL()->GetExtraData(), BasicIDEData, ExecuteMacroEvent ), pMethod ); } } diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx index 35c4eafbebf1..42ba65d60837 100644 --- a/basctl/source/basicide/basobj3.cxx +++ b/basctl/source/basicide/basobj3.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 @@ -223,7 +223,7 @@ bool RenameDialog( Window* pErrorParent, const ScriptDocument& rDocument, const DBG_ASSERT( nId, "No entry in Tabbar!" ); if ( nId ) { - BasicIDETabBar* pTabBar = (BasicIDETabBar*)pIDEShell->GetTabBar(); + BasicIDETabBar* pTabBar = (BasicIDETabBar*)pIDEShell->GetTabBar(); pTabBar->SetPageText( nId, rNewName ); pTabBar->Sort(); pTabBar->MakeVisible( pTabBar->GetCurPageId() ); diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx index 4fb2679cbc9f..ff0e3a126d97 100644 --- a/basctl/source/basicide/bastype2.cxx +++ b/basctl/source/basicide/bastype2.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 @@ -93,7 +93,7 @@ sal_Int32 ModuleInfoHelper::getModuleType( const uno::Reference< container::XNa script::ModuleInfo aModuleInfo = xVBAModuleInfo->getModuleInfo( rModName ); nType = aModuleInfo.ModuleType; } - return nType; + return nType; } BasicEntry::~BasicEntry() @@ -197,7 +197,7 @@ BasicTreeListBox::BasicTreeListBox( Window* pParent, const ResId& rRes ) : { SetNodeDefaultImages(); SetSelectionMode( SINGLE_SELECTION ); - nMode = 0xFF; // Alles + nMode = 0xFF; // Alles } @@ -264,13 +264,13 @@ void BasicTreeListBox::ImpCreateLibEntries( SvLBoxEntry* pDocumentRootEntry, con BOOL bModLibLoaded = FALSE; ::rtl::OUString aOULibName( aLibName ); Reference< script::XLibraryContainer > xModLibContainer( rDocument.getLibraryContainer( E_SCRIPTS ) ); - if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && xModLibContainer->isLibraryLoaded( aOULibName ) ) + if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && xModLibContainer->isLibraryLoaded( aOULibName ) ) bModLibLoaded = TRUE; // check, if the dialog library is loaded BOOL bDlgLibLoaded = FALSE; Reference< script::XLibraryContainer > xDlgLibContainer( rDocument.getLibraryContainer( E_DIALOGS ) ); - if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOULibName ) && xDlgLibContainer->isLibraryLoaded( aOULibName ) ) + if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOULibName ) && xDlgLibContainer->isLibraryLoaded( aOULibName ) ) bDlgLibLoaded = TRUE; BOOL bLoaded = bModLibLoaded || bDlgLibLoaded; @@ -307,8 +307,8 @@ void BasicTreeListBox::ImpCreateLibEntries( SvLBoxEntry* pDocumentRootEntry, con else { pLibRootEntry = AddEntry( - aLibName, - Image( IDEResId( nId ) ), + aLibName, + Image( IDEResId( nId ) ), Image( IDEResId( nIdHC ) ), pDocumentRootEntry, true, std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_LIBRARY ) ) ); @@ -357,7 +357,7 @@ void BasicTreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const Sequence< ::rtl::OUString > aNames = BasicIDE::GetMethodNames( rDocument, rLibName, aModName ); sal_Int32 nCount = aNames.getLength(); const ::rtl::OUString* pNames = aNames.getConstArray(); - + for ( sal_Int32 j = 0 ; j < nCount ; j++ ) { String aName = pNames[ j ]; @@ -378,7 +378,7 @@ void BasicTreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const { DBG_UNHANDLED_EXCEPTION(); } - } + } } // dialogs @@ -418,7 +418,7 @@ void BasicTreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const void BasicTreeListBox::ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const String& rLibName ) { - + ::std::vector< std::pair< BasicEntryType, ::rtl::OUString > > aEntries; aEntries.push_back( ::std::make_pair( OBJ_TYPE_DOCUMENT_OBJECTS, String( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ) ) ); aEntries.push_back( ::std::make_pair( OBJ_TYPE_USERFORMS, String( IDEResId( RID_STR_USERFORMS ) ) ) ); @@ -542,7 +542,7 @@ SvLBoxEntry* BasicTreeListBox::ImpFindEntry( SvLBoxEntry* pParent, const String& SvLBoxEntry* pEntry = pParent ? FirstChild( pParent ) : GetEntry( nRootPos ); while ( pEntry ) { - if ( GetEntryText( pEntry ) == rText ) + if ( GetEntryText( pEntry ) == rText ) return pEntry; pEntry = pParent ? NextSibling( pEntry ) : GetEntry( ++nRootPos ); @@ -672,7 +672,7 @@ long BasicTreeListBox::ExpandingHdl() ::rtl::OUString aOULibName( aLibName ); Reference< script::XLibraryContainer > xModLibContainer( aDocument.getLibraryContainer( E_SCRIPTS ) ); if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) ) - { + { Reference< script::XLibraryContainerPassword > xPasswd( xModLibContainer, UNO_QUERY ); if ( xPasswd.is() && xPasswd->isLibraryPasswordProtected( aOULibName ) && !xPasswd->isLibraryPasswordVerified( aOULibName ) ) { @@ -699,7 +699,7 @@ BOOL BasicTreeListBox::IsEntryProtected( SvLBoxEntry* pEntry ) ::rtl::OUString aOULibName( aDesc.GetLibName() ); Reference< script::XLibraryContainer > xModLibContainer( aDocument.getLibraryContainer( E_SCRIPTS ) ); if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) ) - { + { Reference< script::XLibraryContainerPassword > xPasswd( xModLibContainer, UNO_QUERY ); if ( xPasswd.is() && xPasswd->isLibraryPasswordProtected( aOULibName ) && !xPasswd->isLibraryPasswordVerified( aOULibName ) ) { @@ -711,7 +711,7 @@ BOOL BasicTreeListBox::IsEntryProtected( SvLBoxEntry* pEntry ) return bProtected; } -SvLBoxEntry* BasicTreeListBox::AddEntry( +SvLBoxEntry* BasicTreeListBox::AddEntry( const String& rText, const Image& rImage, const Image& rImageHC, SvLBoxEntry* pParent, bool bChildrenOnDemand, std::auto_ptr< BasicEntry > aUserData ) { @@ -766,12 +766,12 @@ void BasicTreeListBox::GetRootEntryBitmaps( const ScriptDocument& rDocument, Ima if ( xModuleConfig.is() ) { Sequence< beans::PropertyValue > aModuleDescr; - xModuleConfig->getByName( sModule ) >>= aModuleDescr; + xModuleConfig->getByName( sModule ) >>= aModuleDescr; sal_Int32 nCount = aModuleDescr.getLength(); const beans::PropertyValue* pModuleDescr = aModuleDescr.getConstArray(); for ( sal_Int32 i = 0; i < nCount; ++i ) { - if ( pModuleDescr[ i ].Name.equalsAsciiL( + if ( pModuleDescr[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ooSetupFactoryEmptyDocumentURL" ) ) ) { pModuleDescr[ i ].Value >>= sFactoryURL; @@ -788,12 +788,12 @@ void BasicTreeListBox::GetRootEntryBitmaps( const ScriptDocument& rDocument, Ima if ( sFactoryURL.getLength() ) { - rImage = SvFileInformationManager::GetFileImage( INetURLObject( sFactoryURL ), - FALSE /* small */, + rImage = SvFileInformationManager::GetFileImage( INetURLObject( sFactoryURL ), + FALSE /* small */, FALSE /* normal */ ); - rImageHC = SvFileInformationManager::GetFileImage( INetURLObject( sFactoryURL ), - FALSE /* small */, + rImageHC = SvFileInformationManager::GetFileImage( INetURLObject( sFactoryURL ), + FALSE /* small */, TRUE /* high contrast */ ); } else @@ -818,7 +818,7 @@ void BasicTreeListBox::SetCurrentEntry( BasicEntryDescriptor& rDesc ) { aDesc = BasicEntryDescriptor( ScriptDocument::getApplicationScriptDocument(), - LIBRARY_LOCATION_USER, String::CreateFromAscii( "Standard" ), + LIBRARY_LOCATION_USER, String::CreateFromAscii( "Standard" ), String(), String::CreateFromAscii( "." ), OBJ_TYPE_UNKNOWN ); } ScriptDocument aDocument( aDesc.GetDocument() ); diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx index 08fb03d1c689..0a7bd9d51e4d 100644 --- a/basctl/source/basicide/bastype2.hxx +++ b/basctl/source/basicide/bastype2.hxx @@ -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,9 +42,9 @@ enum BasicEntryType { OBJ_TYPE_UNKNOWN, OBJ_TYPE_DOCUMENT, OBJ_TYPE_LIBRARY, OBJ_TYPE_MODULE, OBJ_TYPE_DIALOG, OBJ_TYPE_METHOD, OBJ_TYPE_DOCUMENT_OBJECTS, OBJ_TYPE_USERFORMS, OBJ_TYPE_NORMAL_MODULES, OBJ_TYPE_CLASS_MODULES }; -#define BROWSEMODE_MODULES 0x01 -#define BROWSEMODE_SUBS 0x02 -#define BROWSEMODE_DIALOGS 0x04 +#define BROWSEMODE_MODULES 0x01 +#define BROWSEMODE_SUBS 0x02 +#define BROWSEMODE_DIALOGS 0x04 class SbMethod; class SbxObject; @@ -159,15 +159,15 @@ private: void SetEntryBitmaps( SvLBoxEntry * pEntry, const Image& rImage, const Image& rImageHC ); protected: - virtual void RequestingChilds( SvLBoxEntry* pParent ); - virtual void ExpandedHdl(); - virtual SvLBoxEntry* CloneEntry( SvLBoxEntry* pSource ); - virtual long ExpandingHdl(); + virtual void RequestingChilds( SvLBoxEntry* pParent ); + virtual void ExpandedHdl(); + virtual SvLBoxEntry* CloneEntry( SvLBoxEntry* pSource ); + virtual long ExpandingHdl(); void ImpCreateLibEntries( SvLBoxEntry* pShellRootEntry, const ScriptDocument& rDocument, LibraryLocation eLocation ); - void ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const String& rLibName ); - void ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const String& rLibName ); - void ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEntry, const ScriptDocument& rDocument, const String& rLibName ); + void ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const String& rLibName ); + void ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const String& rLibName ); + void ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEntry, const ScriptDocument& rDocument, const String& rLibName ); SvLBoxEntry* ImpFindEntry( SvLBoxEntry* pParent, const String& rText ); // DocumentEventListener @@ -187,15 +187,15 @@ public: void ScanEntry( const ScriptDocument& rDocument, LibraryLocation eLocation ); void ScanAllEntries(); - void UpdateEntries(); + void UpdateEntries(); - BOOL IsEntryProtected( SvLBoxEntry* pEntry ); + BOOL IsEntryProtected( SvLBoxEntry* pEntry ); - void SetMode( USHORT nM ) { nMode = nM; } - USHORT GetMode() const { return nMode; } + void SetMode( USHORT nM ) { nMode = nM; } + USHORT GetMode() const { return nMode; } - SbModule* FindModule( SvLBoxEntry* pEntry ); - SbxVariable* FindVariable( SvLBoxEntry* pEntry ); + SbModule* FindModule( SvLBoxEntry* pEntry ); + SbxVariable* FindVariable( SvLBoxEntry* pEntry ); SvLBoxEntry* FindRootEntry( const ScriptDocument& rDocument, LibraryLocation eLocation ); SvLBoxEntry* FindEntry( SvLBoxEntry* pParent, const String& rText, BasicEntryType eType ); @@ -205,7 +205,7 @@ public: bool IsValidEntry( SvLBoxEntry* pEntry ); SvLBoxEntry* AddEntry( const String& rText, const Image& rImage, const Image& rImageHC, - SvLBoxEntry* pParent, bool bChildrenOnDemand, + SvLBoxEntry* pParent, bool bChildrenOnDemand, std::auto_ptr< BasicEntry > aUserData ); String GetRootEntryName( const ScriptDocument& rDocument, LibraryLocation eLocation ) const; @@ -217,6 +217,6 @@ private: LibraryType GetLibraryType() const; }; -#endif // _BASTYPE2_HXX +#endif // _BASTYPE2_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx index 3f114b190587..40f7d0c046b0 100644 --- a/basctl/source/basicide/bastype3.cxx +++ b/basctl/source/basicide/bastype3.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 @@ -62,7 +62,7 @@ void __EXPORT BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry ) return; LibraryLocation eLocation( aDesc.GetLocation() ); - BasicEntryType eType( aDesc.GetType() ); + BasicEntryType eType( aDesc.GetType() ); if ( eType == OBJ_TYPE_DOCUMENT ) { @@ -88,8 +88,8 @@ void __EXPORT BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry ) if ( bOK ) { - // load module library - BOOL bModLibLoaded = FALSE; + // load module library + BOOL bModLibLoaded = FALSE; if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) ) { if ( !xModLibContainer->isLibraryLoaded( aOULibName ) ) @@ -103,7 +103,7 @@ void __EXPORT BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry ) // load dialog library BOOL bDlgLibLoaded = FALSE; - Reference< script::XLibraryContainer > xDlgLibContainer( aDocument.getLibraryContainer( E_DIALOGS ), UNO_QUERY ); + Reference< script::XLibraryContainer > xDlgLibContainer( aDocument.getLibraryContainer( E_DIALOGS ), UNO_QUERY ); if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOULibName ) ) { if ( !xDlgLibContainer->isLibraryLoaded( aOULibName ) ) @@ -132,7 +132,7 @@ void __EXPORT BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry ) } } } - else if ( eType == OBJ_TYPE_DOCUMENT_OBJECTS + else if ( eType == OBJ_TYPE_DOCUMENT_OBJECTS || eType == OBJ_TYPE_USERFORMS || eType == OBJ_TYPE_NORMAL_MODULES || eType == OBJ_TYPE_CLASS_MODULES ) @@ -156,7 +156,7 @@ void __EXPORT BasicTreeListBox::ExpandedHdl() SvLBoxEntry* pChild = FirstChild( pEntry ); while ( pChild ) { - GetModel()->Remove( pChild ); // Ruft auch den DTOR + GetModel()->Remove( pChild ); // Ruft auch den DTOR pChild = FirstChild( pEntry ); } } @@ -195,12 +195,12 @@ SbxVariable* BasicTreeListBox::FindVariable( SvLBoxEntry* pEntry ) case 4: case 3: case 2: - case 1: + case 1: { aEntries.C40_INSERT( SvLBoxEntry, pEntry, 0 ); } break; - case 0: + case 0: { aDocument = ((BasicDocumentEntry*)pEntry->GetUserData())->GetDocument(); } @@ -300,12 +300,12 @@ BasicEntryDescriptor BasicTreeListBox::GetEntryDescriptor( SvLBoxEntry* pEntry ) case 4: case 3: case 2: - case 1: + case 1: { aEntries.C40_INSERT( SvLBoxEntry, pEntry, 0 ); } break; - case 0: + case 0: { BasicDocumentEntry* pBasicDocumentEntry = (BasicDocumentEntry*)pEntry->GetUserData(); if ( pBasicDocumentEntry ) diff --git a/basctl/source/basicide/bastype3.hxx b/basctl/source/basicide/bastype3.hxx index bc27eaa6cf90..016c4ee484c9 100644 --- a/basctl/source/basicide/bastype3.hxx +++ b/basctl/source/basicide/bastype3.hxx @@ -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 @@ -41,10 +41,10 @@ class EditorWindow; class ExtendedEdit : public Edit { private: - Accelerator aAcc; - Link aAccHdl; - Link aGotFocusHdl; - Link aLoseFocusHdl; + Accelerator aAcc; + Link aAccHdl; + Link aGotFocusHdl; + Link aLoseFocusHdl; protected: DECL_LINK( EditAccHdl, Accelerator * ); @@ -54,14 +54,14 @@ protected: public: ExtendedEdit( Window* pParent, IDEResId nRes ); - void SetAccHdl( const Link& rLink ) { aAccHdl = rLink; } - void SetLoseFocusHdl( const Link& rLink ) { aLoseFocusHdl = rLink; } - void SetGotFocusHdl( const Link& rLink ) { aGotFocusHdl = rLink; } - Accelerator& GetAccelerator() { return aAcc; } + void SetAccHdl( const Link& rLink ) { aAccHdl = rLink; } + void SetLoseFocusHdl( const Link& rLink ) { aLoseFocusHdl = rLink; } + void SetGotFocusHdl( const Link& rLink ) { aGotFocusHdl = rLink; } + Accelerator& GetAccelerator() { return aAcc; } }; -#endif //NO_SPECIALEDIT +#endif //NO_SPECIALEDIT -#endif // _BASTYPE3_HXX +#endif // _BASTYPE3_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/bastype4.hxx b/basctl/source/basicide/bastype4.hxx index a65b286db99d..be4dbc140f08 100644 --- a/basctl/source/basicide/bastype4.hxx +++ b/basctl/source/basicide/bastype4.hxx @@ -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/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index 5faaf7988313..4b0d7564e247 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.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 @@ -41,7 +41,7 @@ #include <basidesh.hrc> #include <bastypes.hxx> #include <bastype2.hxx> -#include <baside2.hxx> // Leider brauche ich teilweise pModulWindow... +#include <baside2.hxx> // Leider brauche ich teilweise pModulWindow... #include <baside3.hxx> #include <baside2.hrc> #include <svtools/textview.hxx> @@ -76,7 +76,7 @@ IDEBaseWindow::IDEBaseWindow( Window* pParent, const ScriptDocument& rDocument, DBG_CTOR( IDEBaseWindow, 0 ); pShellHScrollBar = 0; pShellVScrollBar = 0; - nStatus = 0; + nStatus = 0; } @@ -99,7 +99,7 @@ void IDEBaseWindow::Init() pShellVScrollBar->SetScrollHdl( LINK( this, IDEBaseWindow, ScrollHdl ) ); if ( pShellHScrollBar ) pShellHScrollBar->SetScrollHdl( LINK( this, IDEBaseWindow, ScrollHdl ) ); - DoInit(); // virtuell... + DoInit(); // virtuell... } @@ -115,7 +115,7 @@ void IDEBaseWindow::GrabScrollBars( ScrollBar* pHScroll, ScrollBar* pVScroll ) DBG_CHKTHIS( IDEBaseWindow, 0 ); pShellHScrollBar = pHScroll; pShellVScrollBar = pVScroll; -// Init(); // macht kein Sinn, fuehrt zu flackern, fuehr zu Fehlern... +// Init(); // macht kein Sinn, fuehrt zu flackern, fuehr zu Fehlern... } @@ -321,7 +321,7 @@ void BreakPointList::SetBreakPointsInBasic( SbModule* pModule ) } } -BreakPoint* BreakPointList::FindBreakPoint( ULONG nLine ) +BreakPoint* BreakPointList::FindBreakPoint( ULONG nLine ) { BreakPoint* pBrk = First(); while ( pBrk ) @@ -392,7 +392,7 @@ USHORT __EXPORT IDEBaseWindow::GetSearchOptions() BasicDockingWindow::BasicDockingWindow( Window* pParent ) : - DockingWindow( pParent, WB_BORDER | WB_3DLOOK | WB_DOCKABLE | WB_MOVEABLE | + DockingWindow( pParent, WB_BORDER | WB_3DLOOK | WB_DOCKABLE | WB_MOVEABLE | WB_SIZEABLE | WB_ROLLABLE | WB_DOCKABLE | WB_CLIPCHILDREN ) { @@ -409,12 +409,12 @@ BOOL __EXPORT BasicDockingWindow::Docking( const Point& rPos, Rectangle& rRect ) { rRect.SetSize( aTmpRec.GetSize() ); } - else // Alte Groesse einstellen + else // Alte Groesse einstellen { if ( !aFloatingPosAndSize.IsEmpty() ) rRect.SetSize( aFloatingPosAndSize.GetSize() ); } - return !bDock; // bFloat + return !bDock; // bFloat } @@ -506,8 +506,8 @@ IMPL_LINK_INLINE_END( ExtendedEdit, EditAccHdl, Accelerator *, pAcc ) struct TabBarDDInfo { - ULONG npTabBar; - USHORT nPage; + ULONG npTabBar; + USHORT nPage; TabBarDDInfo() { npTabBar = 0; nPage = 0; } TabBarDDInfo( ULONG _npTabBar, USHORT _nPage ) { npTabBar = _npTabBar; nPage = _nPage; } @@ -545,7 +545,7 @@ void __EXPORT BasicIDETabBar::Command( const CommandEvent& rCEvt ) if ( ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU ) && !IsInEditMode() ) { Point aPos( rCEvt.IsMouseEvent() ? rCEvt.GetMousePosPixel() : Point(1,1) ); - if ( rCEvt.IsMouseEvent() ) // Richtige Tab selektieren + if ( rCEvt.IsMouseEvent() ) // Richtige Tab selektieren { Point aP = PixelToLogic( aPos ); MouseEvent aMouseEvent( aP, 1, MOUSE_SIMPLECLICK, MOUSE_LEFT ); @@ -583,7 +583,7 @@ void __EXPORT BasicIDETabBar::Command( const CommandEvent& rCEvt ) aPopup.RemoveDisabledEntries(); } if ( aDocument.isInVBAMode() ) - { + { // disable to delete or remove object modules in IDE BasicManager* pBasMgr = aDocument.getBasicManager(); if ( pBasMgr ) @@ -706,7 +706,7 @@ void CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, BO nStartPos = searchEOL( rStr, nStartPos ); if( nStartPos == -1 ) break; - nStartPos++; // nicht das \n. + nStartPos++; // nicht das \n. nLine++; } diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx index 34a1f8f62c94..c5bf23e7ce85 100644 --- a/basctl/source/basicide/brkdlg.cxx +++ b/basctl/source/basicide/brkdlg.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 @@ -69,15 +69,15 @@ bool lcl_ParseText( String aText, USHORT& rLineNr ) BreakPointDialog::BreakPointDialog( Window* pParent, BreakPointList& rBrkPntList ) : ModalDialog( pParent, IDEResId( RID_BASICIDE_BREAKPOINTDLG ) ), - aComboBox( this, IDEResId( RID_CB_BRKPOINTS ) ), - aOKButton( this, IDEResId( RID_PB_OK ) ), - aCancelButton( this, IDEResId( RID_PB_CANCEL ) ), - aNewButton( this, IDEResId( RID_PB_NEW ) ), - aDelButton( this, IDEResId( RID_PB_DEL ) ), - aCheckBox( this, IDEResId( RID_CHKB_ACTIVE ) ), - aBrkText( this, IDEResId( RID_FT_BRKPOINTS ) ), - aPassText( this, IDEResId( RID_FT_PASS ) ), - aNumericField( this, IDEResId( RID_FLD_PASS ) ), + aComboBox( this, IDEResId( RID_CB_BRKPOINTS ) ), + aOKButton( this, IDEResId( RID_PB_OK ) ), + aCancelButton( this, IDEResId( RID_PB_CANCEL ) ), + aNewButton( this, IDEResId( RID_PB_NEW ) ), + aDelButton( this, IDEResId( RID_PB_DEL ) ), + aCheckBox( this, IDEResId( RID_CHKB_ACTIVE ) ), + aBrkText( this, IDEResId( RID_FT_BRKPOINTS ) ), + aPassText( this, IDEResId( RID_FT_PASS ) ), + aNumericField( this, IDEResId( RID_FLD_PASS ) ), m_rOriginalBreakPointList(rBrkPntList), m_aModifiedBreakPointList(rBrkPntList) { @@ -98,7 +98,7 @@ BreakPointDialog::BreakPointDialog( Window* pParent, BreakPointList& rBrkPntList aOKButton.SetClickHdl( LINK( this, BreakPointDialog, ButtonHdl ) ); aNewButton.SetClickHdl( LINK( this, BreakPointDialog, ButtonHdl ) ); aDelButton.SetClickHdl( LINK( this, BreakPointDialog, ButtonHdl ) ); -// aShowButton.SetClickHdl( LINK( this, BreakPointDialog, ButtonHdl ) ); +// aShowButton.SetClickHdl( LINK( this, BreakPointDialog, ButtonHdl ) ); aCheckBox.SetClickHdl( LINK( this, BreakPointDialog, CheckBoxHdl ) ); aComboBox.SetSelectHdl( LINK( this, BreakPointDialog, ComboBoxHighlightHdl ) ); @@ -249,10 +249,10 @@ IMPL_LINK( BreakPointDialog, ButtonHdl, Button *, pButton ) } CheckButtons(); } -// else if ( pButton == &aShowButton ) -// { -// ; -// } +// else if ( pButton == &aShowButton ) +// { +// ; +// } return 0; } diff --git a/basctl/source/basicide/brkdlg.hrc b/basctl/source/basicide/brkdlg.hrc index 921990d35e6c..1f313374f3b8 100644 --- a/basctl/source/basicide/brkdlg.hrc +++ b/basctl/source/basicide/brkdlg.hrc @@ -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 @@ -29,7 +29,7 @@ #include <svl/solar.hrc> -#define RID_BASICIDE_BREAKPOINTDLG ( RID_BASICIDE_START + 80 ) +#define RID_BASICIDE_BREAKPOINTDLG ( RID_BASICIDE_START + 80 ) #define RID_CB_BRKPOINTS 2 #define RID_PB_OK 3 @@ -41,5 +41,5 @@ #define RID_FT_BRKPOINTS 9 #define RID_FLD_PASS 10 -#endif // _BRKDLG_HRC +#endif // _BRKDLG_HRC diff --git a/basctl/source/basicide/brkdlg.hxx b/basctl/source/basicide/brkdlg.hxx index 04777bb70518..5513b416f707 100644 --- a/basctl/source/basicide/brkdlg.hxx +++ b/basctl/source/basicide/brkdlg.hxx @@ -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,36 +40,36 @@ class BreakPointDialog : public ModalDialog { private: - ComboBox aComboBox; - OKButton aOKButton; - CancelButton aCancelButton; - PushButton aNewButton; - PushButton aDelButton; -// PushButton aShowButton; - CheckBox aCheckBox; - FixedText aBrkText; - FixedText aPassText; - NumericField aNumericField; + ComboBox aComboBox; + OKButton aOKButton; + CancelButton aCancelButton; + PushButton aNewButton; + PushButton aDelButton; +// PushButton aShowButton; + CheckBox aCheckBox; + FixedText aBrkText; + FixedText aPassText; + NumericField aNumericField; BreakPointList & m_rOriginalBreakPointList; BreakPointList m_aModifiedBreakPointList; protected: - void CheckButtons(); + void CheckButtons(); DECL_LINK( CheckBoxHdl, CheckBox * ); DECL_LINK( ComboBoxHighlightHdl, ComboBox * ); DECL_LINK( EditModifyHdl, Edit * ); DECL_LINK( ButtonHdl, Button * ); - void UpdateFields( BreakPoint* pBrk ); - BreakPoint* GetSelectedBreakPoint(); + void UpdateFields( BreakPoint* pBrk ); + BreakPoint* GetSelectedBreakPoint(); public: BreakPointDialog( Window* pParent, BreakPointList& rBrkList ); - void SetCurrentBreakPoint( BreakPoint* pBrk ); + void SetCurrentBreakPoint( BreakPoint* pBrk ); }; -#endif // _BRKDLG_HXX +#endif // _BRKDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/brkdlg.src b/basctl/source/basicide/brkdlg.src index 00fd8fbf8968..cbb7e72f2b6b 100644 --- a/basctl/source/basicide/brkdlg.src +++ b/basctl/source/basicide/brkdlg.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 @@ -29,12 +29,12 @@ #include <brkdlg.hrc> ModalDialog RID_BASICIDE_BREAKPOINTDLG { - // HelpId = HID_BASICIDE_BRKPNTS ; + // HelpId = HID_BASICIDE_BRKPNTS ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 178 , 116 ) ; Moveable = TRUE ; - // Closeable = TRUE; + // Closeable = TRUE; ComboBox RID_CB_BRKPOINTS { Pos = MAP_APPFONT ( 6 , 14 ) ; diff --git a/basctl/source/basicide/doceventnotifier.cxx b/basctl/source/basicide/doceventnotifier.cxx index a47c269f2c3d..64b41dc484b1 100644 --- a/basctl/source/basicide/doceventnotifier.cxx +++ b/basctl/source/basicide/doceventnotifier.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 @@ -189,7 +189,7 @@ namespace basctl break; } } - + //-------------------------------------------------------------------- void SAL_CALL DocumentEventNotifier_Impl::disposing( const csslang::EventObject& /*Event*/ ) throw (RuntimeException) { diff --git a/basctl/source/basicide/docsignature.cxx b/basctl/source/basicide/docsignature.cxx index 19cf14004612..07c258cc39df 100644 --- a/basctl/source/basicide/docsignature.cxx +++ b/basctl/source/basicide/docsignature.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/basctl/source/basicide/documentenumeration.cxx b/basctl/source/basicide/documentenumeration.cxx index e9cfa14b1ee0..dc1d108d96b3 100644 --- a/basctl/source/basicide/documentenumeration.cxx +++ b/basctl/source/basicide/documentenumeration.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/basctl/source/basicide/documentenumeration.hxx b/basctl/source/basicide/documentenumeration.hxx index 6778c676c15c..a0767ac1f8fb 100644 --- a/basctl/source/basicide/documentenumeration.hxx +++ b/basctl/source/basicide/documentenumeration.hxx @@ -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/basctl/source/basicide/ide_pch.cxx b/basctl/source/basicide/ide_pch.cxx index 44937011dc2f..3a80c65525d6 100644 --- a/basctl/source/basicide/ide_pch.cxx +++ b/basctl/source/basicide/ide_pch.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/basctl/source/basicide/ide_pch.hxx b/basctl/source/basicide/ide_pch.hxx index d30218e73c50..e51702fdca60 100644 --- a/basctl/source/basicide/ide_pch.hxx +++ b/basctl/source/basicide/ide_pch.hxx @@ -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 @@ -27,8 +27,8 @@ ************************************************************************/ #include <svheader.hxx> -#define ITEMID_SEARCH 0 -#define ITEMID_SIZE 0 +#define ITEMID_SEARCH 0 +#define ITEMID_SIZE 0 #include <vcl/wrkwin.hxx> #include <vcl/msgbox.hxx> diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx index dd06ff421860..c0fd6456a2f3 100644 --- a/basctl/source/basicide/iderdll.cxx +++ b/basctl/source/basicide/iderdll.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 @@ -53,7 +53,7 @@ #include <propbrw.hxx> -#define ITEMID_SEARCH 0 +#define ITEMID_SEARCH 0 #include <svl/srchitem.hxx> #include <com/sun/star/script/XLibraryContainerPassword.hpp> @@ -80,7 +80,7 @@ BasicIDEDLL::BasicIDEDLL() pShell = 0; pExtraData = 0; - GetExtraData(); // damit GlobalErrorHdl gesetzt wird. + GetExtraData(); // damit GlobalErrorHdl gesetzt wird. } BasicIDEDLL::~BasicIDEDLL() @@ -155,9 +155,9 @@ BasicIDEData::~BasicIDEData() // sowieso sehr spaet, nach dem letzten Basic, zerstoert. // Durch den Aufruf werden dann aber wieder AppDaten erzeugt und nicht // mehr zerstoert => MLK's beim Purify -// StarBASIC::SetGlobalErrorHdl( Link() ); -// StarBASIC::SetGlobalBreakHdl( Link() ); -// StarBASIC::setGlobalStarScriptListener( XEngineListenerRef() ); +// StarBASIC::SetGlobalErrorHdl( Link() ); +// StarBASIC::SetGlobalBreakHdl( Link() ); +// StarBASIC::setGlobalStarScriptListener( XEngineListenerRef() ); delete pSearchItem; //delete pAccelerator; @@ -223,7 +223,7 @@ IMPL_LINK( BasicIDEData, ExecuteMacroEvent, void *, pData ) // Ist es eine StarScript-Methode? Am Parent erkennen DBG_ASSERT( pMethod->GetParent()->GetFlags() & SBX_EXTSEARCH, "Kein EXTSEARCH!" ); BasicIDE::RunMethod( pMethod ); - pMethod->ReleaseRef(); // muss vorher inkrementiert worden sein! + pMethod->ReleaseRef(); // muss vorher inkrementiert worden sein! SFX_APP()->LeaveBasicCall(); } return 0; diff --git a/basctl/source/basicide/iderdll2.hxx b/basctl/source/basicide/iderdll2.hxx index e79c11721ed6..c49d3507ea69 100644 --- a/basctl/source/basicide/iderdll2.hxx +++ b/basctl/source/basicide/iderdll2.hxx @@ -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,29 +40,29 @@ class Accelerator; #include <bastypes.hxx> #include <bastype2.hxx> -#define INVPOSITION 0x7fff +#define INVPOSITION 0x7fff class BasicIDEData { private: - Accelerator* pAccelerator; - SvxSearchItem* pSearchItem; + Accelerator* pAccelerator; + SvxSearchItem* pSearchItem; - LibInfos aLibInfos; + LibInfos aLibInfos; BasicEntryDescriptor m_aLastEntryDesc; - Point aObjCatPos; - Size aObjCatSize; + Point aObjCatPos; + Size aObjCatSize; - String aAddLibPath; - String aAddLibFilter; + String aAddLibPath; + String aAddLibFilter; - USHORT nBasicDialogCount; + USHORT nBasicDialogCount; - BOOL OLD_bRelMacroRecording; - BOOL bChoosingMacro; - BOOL bShellInCriticalSection; + BOOL OLD_bRelMacroRecording; + BOOL bChoosingMacro; + BOOL bShellInCriticalSection; protected: DECL_LINK( GlobalBasicBreakHdl, StarBASIC * ); @@ -71,36 +71,36 @@ public: BasicIDEData(); ~BasicIDEData(); - LibInfos& GetLibInfos() { return aLibInfos; } + LibInfos& GetLibInfos() { return aLibInfos; } BasicEntryDescriptor& GetLastEntryDescriptor() { return m_aLastEntryDesc; } void SetLastEntryDescriptor( BasicEntryDescriptor& rDesc ) { m_aLastEntryDesc = rDesc; } - BOOL& ChoosingMacro() { return bChoosingMacro; } - BOOL& ShellInCriticalSection() { return bShellInCriticalSection; } + BOOL& ChoosingMacro() { return bChoosingMacro; } + BOOL& ShellInCriticalSection() { return bShellInCriticalSection; } - USHORT GetBasicDialogCount() const { return nBasicDialogCount; } - void IncBasicDialogCount() { nBasicDialogCount++; } - void DecBasicDialogCount() { nBasicDialogCount--; } + USHORT GetBasicDialogCount() const { return nBasicDialogCount; } + void IncBasicDialogCount() { nBasicDialogCount++; } + void DecBasicDialogCount() { nBasicDialogCount--; } - SvxSearchItem& GetSearchItem() const; - void SetSearchItem( const SvxSearchItem& rItem ); + SvxSearchItem& GetSearchItem() const; + void SetSearchItem( const SvxSearchItem& rItem ); - void SetObjectCatalogPos( const Point& rPnt ) + void SetObjectCatalogPos( const Point& rPnt ) { aObjCatPos = rPnt; } - const Point& GetObjectCatalogPos() const + const Point& GetObjectCatalogPos() const { return aObjCatPos; } - void SetObjectCatalogSize( const Size& rSize ) + void SetObjectCatalogSize( const Size& rSize ) { aObjCatSize = rSize; } - const Size& GetObjectCatalogSize() const + const Size& GetObjectCatalogSize() const { return aObjCatSize; } - const String& GetAddLibPath() const { return aAddLibPath; } - void SetAddLibPath( const String& rPath ) { aAddLibPath = rPath; } + const String& GetAddLibPath() const { return aAddLibPath; } + void SetAddLibPath( const String& rPath ) { aAddLibPath = rPath; } - const String& GetAddLibFilter() const { return aAddLibFilter; } - void SetAddLibFilter( const String& rFilter ) { aAddLibFilter = rFilter; } + const String& GetAddLibFilter() const { return aAddLibFilter; } + void SetAddLibFilter( const String& rFilter ) { aAddLibFilter = rFilter; } DECL_LINK( ExecuteMacroEvent, void * ); }; diff --git a/basctl/source/basicide/idetemp.hxx b/basctl/source/basicide/idetemp.hxx index 7700d94f0748..2d8d826bdea7 100644 --- a/basctl/source/basicide/idetemp.hxx +++ b/basctl/source/basicide/idetemp.hxx @@ -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/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx index bd0259fe0637..b12cc89206be 100644 --- a/basctl/source/basicide/localizationmgr.cxx +++ b/basctl/source/basicide/localizationmgr.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 @@ -29,13 +29,13 @@ #include "precompiled_basctl.hxx" #include <ide_pch.hxx> -#include <basidesh.hxx> +#include <basidesh.hxx> #include <baside3.hxx> #include <basobj.hxx> #include <iderdll.hxx> #include "dlged.hxx" -#include <localizationmgr.hxx> +#include <localizationmgr.hxx> #include <com/sun/star/resource/XStringResourceSupplier.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> @@ -135,9 +135,9 @@ bool isLanguageDependentProperty( ::rtl::OUString aName ) pLangDepProp++; } return bRet; -} +} //============================================ - + void LocalizationMgr::implEnableDisableResourceForAllLibraryDialogs( HandleResourceMode eMode ) { Sequence< ::rtl::OUString > aDlgNames = m_aDocument.getObjectNames( E_DIALOGS, m_aLibName ); @@ -201,11 +201,11 @@ extern bool localesAreEqual( const ::com::sun::star::lang::Locale& rLocaleLeft, const ::com::sun::star::lang::Locale& rLocaleRight ); // Works on xStringResourceManager's current language for SET_IDS/RESET_IDS, -// anyway only one language should exist when calling this method then, +// anyway only one language should exist when calling this method then, // either the first one for mode SET_IDS or the last one for mode RESET_IDS sal_Int32 LocalizationMgr::implHandleControlResourceProperties ( Any aControlAny, const ::rtl::OUString& aDialogName, const ::rtl::OUString& aCtrlName, - Reference< XStringResourceManager > xStringResourceManager, + Reference< XStringResourceManager > xStringResourceManager, Reference< XStringResourceResolver > xSourceStringResolver, HandleResourceMode eMode ) { sal_Int32 nChangedCount = 0; @@ -796,7 +796,7 @@ void LocalizationMgr::handleRemoveLocales( Sequence< Locale > aLocaleSeq ) handleTranslationbar(); } - DBG_ASSERT( bConsistant, + DBG_ASSERT( bConsistant, "LocalizationMgr::handleRemoveLocales(): sequence contains unsupported locales" ); } @@ -889,7 +889,7 @@ DialogWindow* FindDialogWindowForEditor( DlgEditor* pEditor ) pWin = aIDEWindowTable.Next(); } return pFoundDlgWin; -} +} void LocalizationMgr::setControlResourceIDsForNewEditorObject( DlgEditor* pEditor, @@ -920,7 +920,7 @@ void LocalizationMgr::setControlResourceIDsForNewEditorObject( DlgEditor* pEdito if( nChangedCount ) BasicIDE::MarkDocumentModified( aDocument ); -} +} void LocalizationMgr::renameControlResourceIDsForEditorObject( DlgEditor* pEditor, ::com::sun::star::uno::Any aControlAny, const ::rtl::OUString& aNewCtrlName ) @@ -947,7 +947,7 @@ void LocalizationMgr::renameControlResourceIDsForEditorObject( DlgEditor* pEdito implHandleControlResourceProperties ( aControlAny, aDialogName, aNewCtrlName, xStringResourceManager, xDummyStringResolver, RENAME_CONTROL_IDS ); -} +} void LocalizationMgr::deleteControlResourceIDsForDeletedEditorObject( DlgEditor* pEditor, @@ -974,7 +974,7 @@ void LocalizationMgr::deleteControlResourceIDsForDeletedEditorObject( DlgEditor* if( nChangedCount ) BasicIDE::MarkDocumentModified( aDocument ); -} +} void LocalizationMgr::setStringResourceAtDialog( const ScriptDocument& rDocument, const String& aLibName, const String& aDlgName, Reference< container::XNameContainer > xDialogModel ) @@ -1149,7 +1149,7 @@ void LocalizationMgr::copyResourcesForPastedEditorObject( DlgEditor* pEditor, implHandleControlResourceProperties ( aControlAny, aDialogName, aCtrlName, xStringResourceManager, xSourceStringResolver, MOVE_RESOURCES ); -} +} void LocalizationMgr::copyResourceForDroppedDialog( Reference< container::XNameContainer > xDialogModel, const ::rtl::OUString& aDialogName, Reference< XStringResourceManager > xStringResourceManager, @@ -1218,7 +1218,7 @@ Reference< XStringResourceManager > LocalizationMgr::getStringResourceFromDialog Reference< resource::XStringResourceResolver > xStringResourceResolver = xStringResourceSupplier->getStringResource(); - xStringResourceManager = + xStringResourceManager = Reference< resource::XStringResourceManager >( xStringResourceResolver, UNO_QUERY ); } } diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index e3f21bba669a..01e33f2aec50 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.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 @@ -38,7 +38,7 @@ #include <macrodlg.hrc> #include <basidesh.hrc> #include <basidesh.hxx> -#include <baside2.hrc> // ID's fuer Imagese +#include <baside2.hrc> // ID's fuer Imagese #include <basobj.hxx> #include <baside3.hxx> @@ -63,23 +63,23 @@ using namespace ::com::sun::star::uno; DECLARE_LIST( MacroList, SbMethod* ) MacroChooser::MacroChooser( Window* pParnt, BOOL bCreateEntries ) : - SfxModalDialog( pParnt, IDEResId( RID_MACROCHOOSER ) ), - aMacroNameTxt( this, IDEResId( RID_TXT_MACRONAME ) ), - aMacroNameEdit( this, IDEResId( RID_ED_MACRONAME ) ), - aMacroFromTxT( this, IDEResId( RID_TXT_MACROFROM ) ), - aMacrosSaveInTxt( this, IDEResId( RID_TXT_SAVEMACRO ) ), - aBasicBox( this, IDEResId( RID_CTRL_LIB ) ), - aMacrosInTxt( this, IDEResId( RID_TXT_MACROSIN ) ), - aMacroBox( this, IDEResId( RID_CTRL_MACRO ) ), - aRunButton( this, IDEResId( RID_PB_RUN ) ), - aCloseButton( this, IDEResId( RID_PB_CLOSE ) ), - aAssignButton( this, IDEResId( RID_PB_ASSIGN ) ), - aEditButton( this, IDEResId( RID_PB_EDIT ) ), - aNewDelButton( this, IDEResId( RID_PB_DEL ) ), - aOrganizeButton( this, IDEResId( RID_PB_ORG ) ), - aHelpButton( this, IDEResId( RID_PB_HELP ) ), - aNewLibButton( this, IDEResId( RID_PB_NEWLIB ) ), - aNewModButton( this, IDEResId( RID_PB_NEWMOD ) ) + SfxModalDialog( pParnt, IDEResId( RID_MACROCHOOSER ) ), + aMacroNameTxt( this, IDEResId( RID_TXT_MACRONAME ) ), + aMacroNameEdit( this, IDEResId( RID_ED_MACRONAME ) ), + aMacroFromTxT( this, IDEResId( RID_TXT_MACROFROM ) ), + aMacrosSaveInTxt( this, IDEResId( RID_TXT_SAVEMACRO ) ), + aBasicBox( this, IDEResId( RID_CTRL_LIB ) ), + aMacrosInTxt( this, IDEResId( RID_TXT_MACROSIN ) ), + aMacroBox( this, IDEResId( RID_CTRL_MACRO ) ), + aRunButton( this, IDEResId( RID_PB_RUN ) ), + aCloseButton( this, IDEResId( RID_PB_CLOSE ) ), + aAssignButton( this, IDEResId( RID_PB_ASSIGN ) ), + aEditButton( this, IDEResId( RID_PB_EDIT ) ), + aNewDelButton( this, IDEResId( RID_PB_DEL ) ), + aOrganizeButton( this, IDEResId( RID_PB_ORG ) ), + aHelpButton( this, IDEResId( RID_PB_HELP ) ), + aNewLibButton( this, IDEResId( RID_PB_NEWLIB ) ), + aNewModButton( this, IDEResId( RID_PB_NEWMOD ) ) { FreeResource(); @@ -106,9 +106,9 @@ MacroChooser::MacroChooser( Window* pParnt, BOOL bCreateEntries ) : // Buttons only for MACROCHOOSER_RECORDING aNewLibButton.SetClickHdl( LINK( this, MacroChooser, ButtonHdl ) ); aNewModButton.SetClickHdl( LINK( this, MacroChooser, ButtonHdl ) ); - aNewLibButton.Hide(); // default - aNewModButton.Hide(); // default - aMacrosSaveInTxt.Hide(); // default + aNewLibButton.Hide(); // default + aNewModButton.Hide(); // default + aMacrosSaveInTxt.Hide(); // default aMacrosInTxt.SetStyle( WB_NOMULTILINE | WB_PATHELLIPSIS ); @@ -120,7 +120,7 @@ MacroChooser::MacroChooser( Window* pParnt, BOOL bCreateEntries ) : aMacroBox.SetSelectHdl( LINK( this, MacroChooser, MacroSelectHdl ) ); aBasicBox.SetMode( BROWSEMODE_MODULES ); - aBasicBox.SetWindowBits( WB_HASLINES | WB_HASLINESATROOT | + aBasicBox.SetWindowBits( WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HSCROLL ); @@ -389,13 +389,13 @@ SbMethod* MacroChooser::CreateMacro() aModName = aModName.GetToken( 0, ' ', nIndex ); } pModule = pBasic->FindModule( aModName ); - } + } else if ( pBasic->GetModules()->Count() ) pModule = (SbModule*)pBasic->GetModules()->Get( 0 ); if ( !pModule ) { - pModule = createModImpl( static_cast<Window*>( this ), + pModule = createModImpl( static_cast<Window*>( this ), aDocument, aBasicBox, aLibName, aModName ); } @@ -421,7 +421,7 @@ void MacroChooser::SaveSetCurEntry( SvTreeListBox& rBox, SvLBoxEntry* pEntry ) void MacroChooser::CheckButtons() { - SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry(); + SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry(); BasicEntryDescriptor aDesc( aBasicBox.GetEntryDescriptor( pCurEntry ) ); SvLBoxEntry* pMacroEntry = aMacroBox.FirstSelected(); SbMethod* pMethod = GetMacro(); @@ -761,8 +761,8 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton ) } CheckButtons(); UpdateFields(); - //if ( aMacroBox.GetCurEntry() ) // OV-Bug ? - // aMacroBox.Select( aMacroBox.GetCurEntry() ); + //if ( aMacroBox.GetCurEntry() ) // OV-Bug ? + // aMacroBox.Select( aMacroBox.GetCurEntry() ); } else { @@ -832,7 +832,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton ) ScriptDocument aDocument( aDesc.GetDocument() ); String aLibName( aDesc.GetLibName() ); String aModName; - createModImpl( static_cast<Window*>( this ), aDocument, + createModImpl( static_cast<Window*>( this ), aDocument, aBasicBox, aLibName, aModName, true ); } else if ( pButton == &aOrganizeButton ) @@ -844,7 +844,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton ) USHORT nRet = pDlg->Execute(); delete pDlg; - if ( nRet ) // Nicht einfach nur geschlossen + if ( nRet ) // Nicht einfach nur geschlossen { EndDialog( MACRO_EDIT ); return 0; @@ -863,8 +863,8 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton ) void MacroChooser::UpdateFields() { - SvLBoxEntry* pMacroEntry = aMacroBox.GetCurEntry(); - String aEmptyStr; + SvLBoxEntry* pMacroEntry = aMacroBox.GetCurEntry(); + String aEmptyStr; aMacroNameEdit.SetText( aEmptyStr ); if ( pMacroEntry ) diff --git a/basctl/source/basicide/macrodlg.hrc b/basctl/source/basicide/macrodlg.hrc index ae96e1b0b92f..e209ae060019 100644 --- a/basctl/source/basicide/macrodlg.hrc +++ b/basctl/source/basicide/macrodlg.hrc @@ -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 @@ -29,31 +29,31 @@ #include <svl/solar.hrc> -#define RID_MACROCHOOSER ( RID_BASICIDE_START + 50 ) -#define RID_STR_BTNDEL ( RID_BASICIDE_START + 51 ) -#define RID_STR_BTNNEW ( RID_BASICIDE_START + 52 ) -#define RID_STR_CHOOSE ( RID_BASICIDE_START + 53 ) -#define RID_STR_RUN ( RID_BASICIDE_START + 54 ) +#define RID_MACROCHOOSER ( RID_BASICIDE_START + 50 ) +#define RID_STR_BTNDEL ( RID_BASICIDE_START + 51 ) +#define RID_STR_BTNNEW ( RID_BASICIDE_START + 52 ) +#define RID_STR_CHOOSE ( RID_BASICIDE_START + 53 ) +#define RID_STR_RUN ( RID_BASICIDE_START + 54 ) #define RID_STR_RECORD ( RID_BASICIDE_START + 56 ) -#define RID_CTRL_MACRO 1 -#define RID_CTRL_LIB 2 -#define RID_TXT_MACRONAME 3 -#define RID_TXT_MACROFROM 4 -#define RID_ED_MACRONAME 5 -#define RID_TXT_DESCRIPTION 6 -#define RID_PB_RUN 8 -#define RID_PB_CLOSE 9 -#define RID_PB_EDIT 10 -#define RID_PB_ORG 11 -#define RID_PB_DEL 12 -#define RID_PB_ASSIGN 13 -#define RID_PB_HELP 15 -#define RID_ML_DESCRIPTION 16 -#define RID_TXT_MACROSIN 17 -#define RID_TXT_SAVEMACRO 18 -#define RID_PB_NEWLIB 19 -#define RID_PB_NEWMOD 20 +#define RID_CTRL_MACRO 1 +#define RID_CTRL_LIB 2 +#define RID_TXT_MACRONAME 3 +#define RID_TXT_MACROFROM 4 +#define RID_ED_MACRONAME 5 +#define RID_TXT_DESCRIPTION 6 +#define RID_PB_RUN 8 +#define RID_PB_CLOSE 9 +#define RID_PB_EDIT 10 +#define RID_PB_ORG 11 +#define RID_PB_DEL 12 +#define RID_PB_ASSIGN 13 +#define RID_PB_HELP 15 +#define RID_ML_DESCRIPTION 16 +#define RID_TXT_MACROSIN 17 +#define RID_TXT_SAVEMACRO 18 +#define RID_PB_NEWLIB 19 +#define RID_PB_NEWMOD 20 #endif // _MACRODLG_HRC diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx index b6841377833b..287fe837aee7 100644 --- a/basctl/source/basicide/macrodlg.hxx +++ b/basctl/source/basicide/macrodlg.hxx @@ -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 @@ -38,45 +38,45 @@ #include <vcl/button.hxx> -#define MACRO_CLOSE 10 -#define MACRO_OK_RUN 11 -#define MACRO_NEW 12 -#define MACRO_EDIT 14 -#define MACRO_ORGANIZE 15 -#define MACRO_ASSIGN 16 +#define MACRO_CLOSE 10 +#define MACRO_OK_RUN 11 +#define MACRO_NEW 12 +#define MACRO_EDIT 14 +#define MACRO_ORGANIZE 15 +#define MACRO_ASSIGN 16 -#define MACROCHOOSER_ALL 1 -#define MACROCHOOSER_CHOOSEONLY 2 -#define MACROCHOOSER_RECORDING 3 +#define MACROCHOOSER_ALL 1 +#define MACROCHOOSER_CHOOSEONLY 2 +#define MACROCHOOSER_RECORDING 3 class BasicManager; class MacroChooser : public SfxModalDialog { private: - FixedText aMacroNameTxt; - Edit aMacroNameEdit; - FixedText aMacroFromTxT; - FixedText aMacrosSaveInTxt; - BasicTreeListBox aBasicBox; - FixedText aMacrosInTxt; - String aMacrosInTxtBaseStr; - SvTreeListBox aMacroBox; - - PushButton aRunButton; - CancelButton aCloseButton; - PushButton aAssignButton; - PushButton aEditButton; - PushButton aNewDelButton; - PushButton aOrganizeButton; - HelpButton aHelpButton; - PushButton aNewLibButton; - PushButton aNewModButton; - - BOOL bNewDelIsDel; - BOOL bForceStoreBasic; - - USHORT nMode; + FixedText aMacroNameTxt; + Edit aMacroNameEdit; + FixedText aMacroFromTxT; + FixedText aMacrosSaveInTxt; + BasicTreeListBox aBasicBox; + FixedText aMacrosInTxt; + String aMacrosInTxtBaseStr; + SvTreeListBox aMacroBox; + + PushButton aRunButton; + CancelButton aCloseButton; + PushButton aAssignButton; + PushButton aEditButton; + PushButton aNewDelButton; + PushButton aOrganizeButton; + HelpButton aHelpButton; + PushButton aNewLibButton; + PushButton aNewModButton; + + BOOL bNewDelIsDel; + BOOL bForceStoreBasic; + + USHORT nMode; DECL_LINK( MacroSelectHdl, SvTreeListBox * ); DECL_LINK( MacroDoubleClickHdl, SvTreeListBox * ); @@ -84,31 +84,31 @@ private: DECL_LINK( EditModifyHdl, Edit * ); DECL_LINK( ButtonHdl, Button * ); - void CheckButtons(); - void SaveSetCurEntry( SvTreeListBox& rBox, SvLBoxEntry* pEntry ); - void UpdateFields(); + void CheckButtons(); + void SaveSetCurEntry( SvTreeListBox& rBox, SvLBoxEntry* pEntry ); + void UpdateFields(); - void EnableButton( Button& rButton, BOOL bEnable ); + void EnableButton( Button& rButton, BOOL bEnable ); - String GetInfo( SbxVariable* pVar ); + String GetInfo( SbxVariable* pVar ); - void StoreMacroDescription(); - void RestoreMacroDescription(); + void StoreMacroDescription(); + void RestoreMacroDescription(); public: MacroChooser( Window* pParent, BOOL bCreateEntries = TRUE ); ~MacroChooser(); - SbMethod* GetMacro(); + SbMethod* GetMacro(); void DeleteMacro(); - SbMethod* CreateMacro(); + SbMethod* CreateMacro(); - virtual short Execute(); + virtual short Execute(); - void SetMode( USHORT nMode ); - USHORT GetMode() const { return nMode; } + void SetMode( USHORT nMode ); + USHORT GetMode() const { return nMode; } }; -#endif // _MACRODLG_HXX +#endif // _MACRODLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/macrodlg.src b/basctl/source/basicide/macrodlg.src index 5037879802b0..b4ef8b0270bb 100644 --- a/basctl/source/basicide/macrodlg.src +++ b/basctl/source/basicide/macrodlg.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 @@ -31,13 +31,13 @@ #include <helpid.hrc> ModalDialog RID_MACROCHOOSER { - // HelpId = SID_BASICCHOOSER ; + // HelpId = SID_BASICCHOOSER ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 287 , 165 ) ; Text [ en-US ] = "%PRODUCTNAME Basic Macros" ; Moveable = TRUE ; - // Closeable = TRUE; + // Closeable = TRUE; FixedText RID_TXT_MACROSIN { diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index b66d6b3510d9..8eb60dbcc9dc 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.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 @@ -112,7 +112,7 @@ private: public: BasicLibUserData( const ScriptDocument& rDocument ) : m_aDocument( rDocument ) { } - virtual ~BasicLibUserData() {}; + virtual ~BasicLibUserData() {}; const ScriptDocument& GetDocument() const { return m_aDocument; } @@ -126,7 +126,7 @@ public: class BasicLibLBoxString : public SvLBoxString { public: - BasicLibLBoxString( SvLBoxEntry* pEntry, USHORT nFlags, const String& rTxt ) : + BasicLibLBoxString( SvLBoxEntry* pEntry, USHORT nFlags, const String& rTxt ) : SvLBoxString( pEntry, nFlags, rTxt ) {} virtual void Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags, SvLBoxEntry* pEntry ); @@ -172,7 +172,7 @@ BasicCheckBox::BasicCheckBox( Window* pParent, const ResId& rResId ) ,m_aDocument( ScriptDocument::getApplicationScriptDocument() ) { nMode = LIBMODE_MANAGER; - long aTabs_[] = { 1, 12 }; // Mindestens einen braucht die TabPos... + long aTabs_[] = { 1, 12 }; // Mindestens einen braucht die TabPos... // 12 wegen der Checkbox SetTabs( aTabs_ ); Init(); @@ -1711,7 +1711,7 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument, std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_MODULE ) ) ); DBG_ASSERT( pEntry_, "InsertEntry fehlgeschlagen!" ); pBasicBox->SetCurEntry( pEntry_ ); - pBasicBox->Select( pBasicBox->GetCurEntry() ); // OV-Bug?! + pBasicBox->Select( pBasicBox->GetCurEntry() ); // OV-Bug?! } } } diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index fcc2858670d1..ac5cd3e6c4e9 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.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 @@ -146,7 +146,7 @@ BOOL __EXPORT ExtBasicTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const Strin SetCurEntry( pEntry ); SetCurEntry( pEntry ); Select( pEntry, FALSE ); - Select( pEntry ); // damit Handler gerufen wird => Edit updaten + Select( pEntry ); // damit Handler gerufen wird => Edit updaten return TRUE; } @@ -223,8 +223,8 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyAcceptDrop( SvLBoxEntry* pEntry ) // check if module library is not loaded, readonly or password protected Reference< script::XLibraryContainer2 > xModLibContainer( rDestDoc.getLibraryContainer( E_SCRIPTS ), UNO_QUERY ); if ( xModLibContainer.is() && xModLibContainer->hasByName( aOUDestLibName ) ) - { - if ( !xModLibContainer->isLibraryLoaded( aOUDestLibName ) ) + { + if ( !xModLibContainer->isLibraryLoaded( aOUDestLibName ) ) bValid = FALSE; if ( xModLibContainer->isLibraryReadOnly( aOUDestLibName ) ) @@ -239,7 +239,7 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyAcceptDrop( SvLBoxEntry* pEntry ) Reference< script::XLibraryContainer2 > xDlgLibContainer( rDestDoc.getLibraryContainer( E_DIALOGS ), UNO_QUERY ); if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOUDestLibName ) ) { - if ( !xDlgLibContainer->isLibraryLoaded( aOUDestLibName ) ) + if ( !xDlgLibContainer->isLibraryLoaded( aOUDestLibName ) ) bValid = FALSE; if ( xDlgLibContainer->isLibraryReadOnly( aOUDestLibName ) ) @@ -269,7 +269,7 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEnt BOOL __EXPORT ExtBasicTreeListBox::NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos ) { -// return FALSE; // Wie kopiere ich ein SBX ?! +// return FALSE; // Wie kopiere ich ein SBX ?! return NotifyCopyingMoving( pTarget, pEntry, rpNewParent, rNewChildPos, FALSE ); } @@ -277,7 +277,7 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEn void BasicIDEShell::CopyDialogResources( Reference< io::XInputStreamProvider >& io_xISP, const ScriptDocument& rSourceDoc, const String& rSourceLibName, const ScriptDocument& rDestDoc, - const String& rDestLibName, const String& rDlgName ) + const String& rDestLibName, const String& rDlgName ) { if ( !io_xISP.is() ) return; @@ -335,8 +335,8 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyCopyingMoving( SvLBoxEntry* pTarget, Sv SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos, BOOL bMove ) { (void)pEntry; - DBG_ASSERT( pEntry, "Kein Eintrag?" ); // Hier ASS ok, sollte nicht mit - DBG_ASSERT( pTarget, "Kein Ziel?" ); // NULL (ganz vorne) erreicht werden + DBG_ASSERT( pEntry, "Kein Eintrag?" ); // Hier ASS ok, sollte nicht mit + DBG_ASSERT( pTarget, "Kein Ziel?" ); // NULL (ganz vorne) erreicht werden USHORT nDepth = GetModel()->GetDepth( pTarget ); DBG_ASSERT( nDepth, "Tiefe?" ); if ( nDepth == 1 ) @@ -369,7 +369,7 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyCopyingMoving( SvLBoxEntry* pTarget, Sv SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL; SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL; - if ( bMove ) // move + if ( bMove ) // move { // remove source module/dialog window if ( rSourceDoc != rDestDoc || aSourceLibName != aDestLibName ) @@ -384,7 +384,7 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyCopyingMoving( SvLBoxEntry* pTarget, Sv try { - if ( eType == OBJ_TYPE_MODULE ) // module + if ( eType == OBJ_TYPE_MODULE ) // module { // get module ::rtl::OUString aModule; @@ -401,7 +401,7 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyCopyingMoving( SvLBoxEntry* pTarget, Sv } } } - else if ( eType == OBJ_TYPE_DIALOG ) // dialog + else if ( eType == OBJ_TYPE_DIALOG ) // dialog { // get dialog Reference< io::XInputStreamProvider > xISP; @@ -427,12 +427,12 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyCopyingMoving( SvLBoxEntry* pTarget, Sv DBG_UNHANDLED_EXCEPTION(); } } - else // copy + else // copy { try { - if ( eType == OBJ_TYPE_MODULE ) // module - { + if ( eType == OBJ_TYPE_MODULE ) // module + { // get module ::rtl::OUString aModule; if ( rSourceDoc.getModule( aSourceLibName, aSourceName, aModule ) ) @@ -442,7 +442,7 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyCopyingMoving( SvLBoxEntry* pTarget, Sv BasicIDE::MarkDocumentModified( rDestDoc ); } } - else if ( eType == OBJ_TYPE_DIALOG ) // dialog + else if ( eType == OBJ_TYPE_DIALOG ) // dialog { // get dialog Reference< io::XInputStreamProvider > xISP; @@ -474,7 +474,7 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyCopyingMoving( SvLBoxEntry* pTarget, Sv } } - return 2; // Aufklappen... + return 2; // Aufklappen... } OrganizeDialog::OrganizeDialog( Window* pParent, INT16 tabId, BasicEntryDescriptor& rDesc ) @@ -553,7 +553,7 @@ IMPL_LINK( OrganizeDialog, ActivatePageHdl, TabControl *, pTabCtrl ) ((LibPage*)pNewTabPage)->SetTabDlg( this ); } break; - default: DBG_ERROR( "PageHdl: Unbekannte ID!" ); + default: DBG_ERROR( "PageHdl: Unbekannte ID!" ); } DBG_ASSERT( pNewTabPage, "Keine Page!" ); pTabCtrl->SetTabPage( nId, pNewTabPage ); @@ -562,14 +562,14 @@ IMPL_LINK( OrganizeDialog, ActivatePageHdl, TabControl *, pTabCtrl ) } ObjectPage::ObjectPage( Window * pParent, const ResId& rResId, USHORT nMode ) : - TabPage( pParent, rResId ), - aLibText( this, IDEResId( RID_STR_LIB ) ), - aBasicBox( this, IDEResId( RID_TRLBOX ) ), - aEditButton( this, IDEResId( RID_PB_EDIT ) ), - aCloseButton( this, IDEResId( RID_PB_CLOSE ) ), - aNewModButton( this, IDEResId( RID_PB_NEWMOD ) ), - aNewDlgButton( this, IDEResId( RID_PB_NEWDLG ) ), - aDelButton( this, IDEResId( RID_PB_DELETE ) ) + TabPage( pParent, rResId ), + aLibText( this, IDEResId( RID_STR_LIB ) ), + aBasicBox( this, IDEResId( RID_TRLBOX ) ), + aEditButton( this, IDEResId( RID_PB_EDIT ) ), + aCloseButton( this, IDEResId( RID_PB_CLOSE ) ), + aNewModButton( this, IDEResId( RID_PB_NEWMOD ) ), + aNewDlgButton( this, IDEResId( RID_PB_NEWDLG ) ), + aDelButton( this, IDEResId( RID_PB_DELETE ) ) { FreeResource(); pTabDlg = 0; @@ -593,7 +593,7 @@ ObjectPage::ObjectPage( Window * pParent, const ResId& rResId, USHORT nMode ) : aBasicBox.SetDragDropMode( SV_DRAGDROP_CTRL_MOVE | SV_DRAGDROP_CTRL_COPY ); aBasicBox.EnableInplaceEditing( TRUE ); aBasicBox.SetMode( nMode ); - aBasicBox.SetWindowBits( WB_HASLINES | WB_HASLINESATROOT | + aBasicBox.SetWindowBits( WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HSCROLL ); aBasicBox.ScanAllEntries(); @@ -603,7 +603,7 @@ ObjectPage::ObjectPage( Window * pParent, const ResId& rResId, USHORT nMode ) : } void ObjectPage::SetCurrentEntry( BasicEntryDescriptor& rDesc ) -{ +{ aBasicBox.SetCurrentEntry( rDesc ); } @@ -634,7 +634,7 @@ void ObjectPage::CheckButtons() aEditButton.Disable(); else aEditButton.Enable(); - } + } else aEditButton.Disable(); @@ -708,12 +708,12 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton ) sal_uInt16 nIndex = 0; aModName = aModName.GetToken( 0, ' ', nIndex ); } - SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDesc.GetDocument(), aDesc.GetLibName(), + SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDesc.GetDocument(), aDesc.GetLibName(), aModName, aBasicBox.ConvertType( aDesc.GetType() ) ); pDispatcher->Execute( SID_BASICIDE_SHOWSBX, SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L ); } } - else // Nur Lib selektiert + else // Nur Lib selektiert { DBG_ASSERT( aBasicBox.GetModel()->GetDepth( pCurEntry ) == 1, "Kein LibEntry?!" ); ScriptDocument aDocument( ScriptDocument::getApplicationScriptDocument() ); @@ -791,7 +791,7 @@ bool ObjectPage::GetSelection( ScriptDocument& rDocument, String& rLibName ) if ( bOK ) bRet = true; - + return bRet; } @@ -802,8 +802,8 @@ void ObjectPage::NewModule() if ( GetSelection( aDocument, aLibName ) ) { - String aModName; - createModImpl( static_cast<Window*>( this ), aDocument, + String aModName; + createModImpl( static_cast<Window*>( this ), aDocument, aBasicBox, aLibName, aModName, true ); } } @@ -838,7 +838,7 @@ void ObjectPage::NewDialog() if ( !aDocument.createDialog( aLibName, aDlgName, xISP ) ) return; - SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDocument, aLibName, aDlgName, BASICIDE_TYPE_DIALOG ); + SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDocument, aLibName, aDlgName, BASICIDE_TYPE_DIALOG ); BasicIDEShell* pIDEShell = IDE_DLL()->GetShell(); SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL; SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL; @@ -871,7 +871,7 @@ void ObjectPage::NewDialog() DBG_ASSERT( pEntry, "InsertEntry fehlgeschlagen!" ); } aBasicBox.SetCurEntry( pEntry ); - aBasicBox.Select( aBasicBox.GetCurEntry() ); // OV-Bug?! + aBasicBox.Select( aBasicBox.GetCurEntry() ); // OV-Bug?! } } } @@ -896,7 +896,7 @@ void ObjectPage::DeleteCurrent() ( eType == OBJ_TYPE_DIALOG && QueryDelDialog( aName, this ) ) ) { aBasicBox.GetModel()->Remove( pCurEntry ); - if ( aBasicBox.GetCurEntry() ) // OV-Bug ? + if ( aBasicBox.GetCurEntry() ) // OV-Bug ? aBasicBox.Select( aBasicBox.GetCurEntry() ); BasicIDEShell* pIDEShell = IDE_DLL()->GetShell(); SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL; @@ -938,13 +938,13 @@ void ObjectPage::EndTabDialog( USHORT nRet ) LibDialog::LibDialog( Window* pParent ) : ModalDialog( pParent, IDEResId( RID_DLG_LIBS ) ), - aOKButton( this, IDEResId( RID_PB_OK ) ), - aCancelButton( this, IDEResId( RID_PB_CANCEL ) ), - aStorageName( this, IDEResId( RID_FT_STORAGENAME ) ), - aLibBox( this, IDEResId( RID_CTRL_LIBS ) ), - aFixedLine( this, IDEResId( RID_FL_OPTIONS ) ), - aReferenceBox( this, IDEResId( RID_CB_REF ) ), - aReplaceBox( this, IDEResId( RID_CB_REPL ) ) + aOKButton( this, IDEResId( RID_PB_OK ) ), + aCancelButton( this, IDEResId( RID_PB_CANCEL ) ), + aStorageName( this, IDEResId( RID_FT_STORAGENAME ) ), + aLibBox( this, IDEResId( RID_CTRL_LIBS ) ), + aFixedLine( this, IDEResId( RID_FL_OPTIONS ) ), + aReferenceBox( this, IDEResId( RID_CB_REF ) ), + aReplaceBox( this, IDEResId( RID_CB_REPL ) ) { SetText( String( IDEResId( RID_STR_APPENDLIBS ) ) ); FreeResource(); @@ -999,7 +999,7 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument, StarBASIC* pBasic = pBasMgr? pBasMgr->GetLib( aLibName ) : 0; if ( pBasic ) pModule = pBasic->FindModule( aModName ); - SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDocument, aLibName, aModName, BASICIDE_TYPE_MODULE ); + SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDocument, aLibName, aModName, BASICIDE_TYPE_MODULE ); BasicIDEShell* pIDEShell = IDE_DLL()->GetShell(); SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL; SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL; @@ -1029,10 +1029,10 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument, { if( !rBasicBox.IsExpanded( pLibSubEntry ) ) rBasicBox.Expand( pLibSubEntry ); - pSubRootEntry = pLibSubEntry; + pSubRootEntry = pLibSubEntry; } } - + SvLBoxEntry* pEntry = rBasicBox.FindEntry( pSubRootEntry, aModName, OBJ_TYPE_MODULE ); if ( !pEntry ) { @@ -1045,7 +1045,7 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument, DBG_ASSERT( pEntry, "InsertEntry fehlgeschlagen!" ); } rBasicBox.SetCurEntry( pEntry ); - rBasicBox.Select( rBasicBox.GetCurEntry() ); // OV-Bug?! + rBasicBox.Select( rBasicBox.GetCurEntry() ); // OV-Bug?! } } } diff --git a/basctl/source/basicide/moduldlg.hrc b/basctl/source/basicide/moduldlg.hrc index 1eed98e0bdca..1504b3bd19c0 100644 --- a/basctl/source/basicide/moduldlg.hrc +++ b/basctl/source/basicide/moduldlg.hrc @@ -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 @@ -29,40 +29,40 @@ #include <svl/solar.hrc> -#define RID_STR_LIB 1 -#define RID_TRLBOX 2 +#define RID_STR_LIB 1 +#define RID_TRLBOX 2 // free -#define RID_PB_EDIT 4 -#define RID_PB_CLOSE 5 -#define RID_PB_NEWMOD 6 -#define RID_PB_NEWDLG 7 -#define RID_PB_DELETE 8 -#define RID_PB_NEWLIB 9 -#define RID_PB_APPEND 10 -#define RID_PB_PASSWORD 11 -#define RID_LB_BASICS 12 -#define RID_STR_BASICS 13 +#define RID_PB_EDIT 4 +#define RID_PB_CLOSE 5 +#define RID_PB_NEWMOD 6 +#define RID_PB_NEWDLG 7 +#define RID_PB_DELETE 8 +#define RID_PB_NEWLIB 9 +#define RID_PB_APPEND 10 +#define RID_PB_PASSWORD 11 +#define RID_LB_BASICS 12 +#define RID_STR_BASICS 13 -#define RID_PB_EXPORT 14 -#define RID_PB_EXPORT_PACKAGE 15 +#define RID_PB_EXPORT 14 +#define RID_PB_EXPORT_PACKAGE 15 -#define RID_TP_MOD 20 -#define RID_TP_LIB 21 -#define RID_TP_DLG 22 +#define RID_TP_MOD 20 +#define RID_TP_LIB 21 +#define RID_TP_DLG 22 -#define RID_TC_ORGANIZE 30 +#define RID_TC_ORGANIZE 30 -#define RID_PB_OK 31 +#define RID_PB_OK 31 #define RID_PB_CANCEL 32 #define RID_CTRL_LIBS 33 #define RID_FL_OPTIONS 34 #define RID_CB_REF 35 #define RID_CB_REPL 36 -#define RID_FT_STORAGENAME 38 +#define RID_FT_STORAGENAME 38 -#define RID_FT_NEWLIB 40 -#define RID_ED_LIBNAME 41 -#define RB_EXPORTASPACKAGE 42 -#define RB_EXPORTASBASIC 43 +#define RID_FT_NEWLIB 40 +#define RID_ED_LIBNAME 41 +#define RB_EXPORTASPACKAGE 42 +#define RB_EXPORTASBASIC 43 -#endif // _MODULDLG_HRC +#endif // _MODULDLG_HRC diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx index 552c638e8daa..3c80c7edb749 100644 --- a/basctl/source/basicide/moduldlg.hxx +++ b/basctl/source/basicide/moduldlg.hxx @@ -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,18 +47,18 @@ class StarBASIC; -#define NEWOBJECTMODE_LIB 1 -#define NEWOBJECTMODE_MOD 2 -#define NEWOBJECTMODE_DLG 3 -#define NEWOBJECTMODE_METH 4 +#define NEWOBJECTMODE_LIB 1 +#define NEWOBJECTMODE_MOD 2 +#define NEWOBJECTMODE_DLG 3 +#define NEWOBJECTMODE_METH 4 class NewObjectDialog : public ModalDialog { private: - FixedText aText; - Edit aEdit; - OKButton aOKButton; - CancelButton aCancelButton; + FixedText aText; + Edit aEdit; + OKButton aOKButton; + CancelButton aCancelButton; DECL_LINK(OkButtonHandler, Button *); @@ -66,19 +66,19 @@ public: NewObjectDialog(Window * pParent, USHORT nMode, bool bCheckName = false); ~NewObjectDialog(); - String GetObjectName() const { return aEdit.GetText(); } - void SetObjectName( const String& rName ) { aEdit.SetText( rName ); aEdit.SetSelection( Selection( 0, rName.Len() ) );} + String GetObjectName() const { return aEdit.GetText(); } + void SetObjectName( const String& rName ) { aEdit.SetText( rName ); aEdit.SetSelection( Selection( 0, rName.Len() ) );} }; class ExportDialog : public ModalDialog { private: - RadioButton maExportAsPackageButton; - RadioButton maExportAsBasicButton; - OKButton maOKButton; - CancelButton maCancelButton; + RadioButton maExportAsPackageButton; + RadioButton maExportAsBasicButton; + OKButton maOKButton; + CancelButton maCancelButton; - sal_Bool mbExportAsPackage; + sal_Bool mbExportAsPackage; DECL_LINK(OkButtonHandler, Button *); @@ -86,24 +86,24 @@ public: ExportDialog( Window * pParent ); ~ExportDialog(); - sal_Bool isExportAsPackage( void ) { return mbExportAsPackage; } + sal_Bool isExportAsPackage( void ) { return mbExportAsPackage; } }; class ExtBasicTreeListBox : public BasicTreeListBox { protected: - virtual BOOL EditingEntry( SvLBoxEntry* pEntry, Selection& rSel ); - virtual BOOL EditedEntry( SvLBoxEntry* pEntry, const String& rNewText ); + virtual BOOL EditingEntry( SvLBoxEntry* pEntry, Selection& rSel ); + virtual BOOL EditedEntry( SvLBoxEntry* pEntry, const String& rNewText ); - virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, SvLBoxEntry* pEntry ); - virtual BOOL NotifyAcceptDrop( SvLBoxEntry* pEntry ); + virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, SvLBoxEntry* pEntry ); + virtual BOOL NotifyAcceptDrop( SvLBoxEntry* pEntry ); - virtual BOOL NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, + virtual BOOL NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos ); - virtual BOOL NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, + virtual BOOL NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos ); - BOOL NotifyCopyingMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, + BOOL NotifyCopyingMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos, BOOL bMove ); public: @@ -111,57 +111,57 @@ public: ~ExtBasicTreeListBox(); }; -#define LIBMODE_CHOOSER 1 -#define LIBMODE_MANAGER 2 +#define LIBMODE_CHOOSER 1 +#define LIBMODE_MANAGER 2 class BasicCheckBox : public SvTabListBox { private: - USHORT nMode; - SvLBoxButtonData* pCheckButton; + USHORT nMode; + SvLBoxButtonData* pCheckButton; ScriptDocument m_aDocument; - void Init(); + void Init(); public: BasicCheckBox( Window* pParent, const ResId& rResId ); ~BasicCheckBox(); - SvLBoxEntry* DoInsertEntry( const String& rStr, ULONG nPos = LISTBOX_APPEND ); - SvLBoxEntry* FindEntry( const String& rName ); + SvLBoxEntry* DoInsertEntry( const String& rStr, ULONG nPos = LISTBOX_APPEND ); + SvLBoxEntry* FindEntry( const String& rName ); - void CheckEntryPos( ULONG nPos, BOOL bCheck = TRUE ); - BOOL IsChecked( ULONG nPos ) const; + void CheckEntryPos( ULONG nPos, BOOL bCheck = TRUE ); + BOOL IsChecked( ULONG nPos ) const; - virtual void InitEntry( SvLBoxEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind ); - virtual BOOL EditingEntry( SvLBoxEntry* pEntry, Selection& rSel ); - virtual BOOL EditedEntry( SvLBoxEntry* pEntry, const String& rNewText ); + virtual void InitEntry( SvLBoxEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind ); + virtual BOOL EditingEntry( SvLBoxEntry* pEntry, Selection& rSel ); + virtual BOOL EditedEntry( SvLBoxEntry* pEntry, const String& rNewText ); void SetDocument( const ScriptDocument& rDocument ) { m_aDocument = rDocument; } - void SetMode( USHORT n ); - USHORT GetMode() const { return nMode; } + void SetMode( USHORT n ); + USHORT GetMode() const { return nMode; } }; class LibDialog: public ModalDialog { private: - OKButton aOKButton; - CancelButton aCancelButton; - FixedText aStorageName; - BasicCheckBox aLibBox; + OKButton aOKButton; + CancelButton aCancelButton; + FixedText aStorageName; + BasicCheckBox aLibBox; FixedLine aFixedLine; - CheckBox aReferenceBox; - CheckBox aReplaceBox; + CheckBox aReferenceBox; + CheckBox aReplaceBox; public: LibDialog( Window* pParent ); ~LibDialog(); - void SetStorageName( const String& rName ); + void SetStorageName( const String& rName ); - BasicCheckBox& GetLibBox() { return aLibBox; } - BOOL IsReference() const { return aReferenceBox.IsChecked(); } - BOOL IsReplace() const { return aReplaceBox.IsChecked(); } + BasicCheckBox& GetLibBox() { return aLibBox; } + BOOL IsReference() const { return aReferenceBox.IsChecked(); } + BOOL IsReplace() const { return aReplaceBox.IsChecked(); } void EnableReference( BOOL b ) { aReferenceBox.Enable( b ); } void EnableReplace( BOOL b ) { aReplaceBox.Enable( b ); } @@ -178,7 +178,7 @@ public: OrganizeDialog( Window* pParent, INT16 tabId, BasicEntryDescriptor& rDesc ); ~OrganizeDialog(); - virtual short Execute(); + virtual short Execute(); DECL_LINK( ActivatePageHdl, TabControl * ); }; @@ -186,33 +186,33 @@ public: class ObjectPage: public TabPage { protected: - FixedText aLibText; - ExtBasicTreeListBox aBasicBox; - PushButton aEditButton; - CancelButton aCloseButton; - PushButton aNewModButton; - PushButton aNewDlgButton; - PushButton aDelButton; + FixedText aLibText; + ExtBasicTreeListBox aBasicBox; + PushButton aEditButton; + CancelButton aCloseButton; + PushButton aNewModButton; + PushButton aNewDlgButton; + PushButton aDelButton; DECL_LINK( BasicBoxHighlightHdl, BasicTreeListBox * ); DECL_LINK( ButtonHdl, Button * ); - void CheckButtons(); + void CheckButtons(); bool GetSelection( ScriptDocument& rDocument, String& rLibName ); - void DeleteCurrent(); - void NewModule(); - void NewDialog(); - void EndTabDialog( USHORT nRet ); + void DeleteCurrent(); + void NewModule(); + void NewDialog(); + void EndTabDialog( USHORT nRet ); - TabDialog* pTabDlg; + TabDialog* pTabDlg; - virtual void ActivatePage(); - virtual void DeactivatePage(); + virtual void ActivatePage(); + virtual void DeactivatePage(); public: ObjectPage( Window* pParent, const ResId& rResId, USHORT nMode ); void SetCurrentEntry( BasicEntryDescriptor& rDesc ); - void SetTabDlg( TabDialog* p ) { pTabDlg = p;} + void SetTabDlg( TabDialog* p ) { pTabDlg = p;} }; @@ -222,16 +222,16 @@ class LibPage: public TabPage { protected: FixedText aBasicsText; - ListBox aBasicsBox; - FixedText aLibText; - BasicCheckBox aLibBox; - PushButton aEditButton; - CancelButton aCloseButton; - PushButton aPasswordButton; - PushButton aExportButton; - PushButton aNewLibButton; - PushButton aInsertLibButton; - PushButton aDelButton; + ListBox aBasicsBox; + FixedText aLibText; + BasicCheckBox aLibBox; + PushButton aEditButton; + CancelButton aCloseButton; + PushButton aPasswordButton; + PushButton aExportButton; + PushButton aNewLibButton; + PushButton aInsertLibButton; + PushButton aDelButton; ScriptDocument m_aCurDocument; LibraryLocation m_eCurLocation; @@ -240,36 +240,36 @@ protected: DECL_LINK( BasicSelectHdl, ListBox * ); DECL_LINK( ButtonHdl, Button * ); DECL_LINK( CheckPasswordHdl, SvxPasswordDialog * ); - void CheckButtons(); - void DeleteCurrent(); - void NewLib(); - void InsertLib(); - void implExportLib( const String& aLibName, const String& aTargetURL, + void CheckButtons(); + void DeleteCurrent(); + void NewLib(); + void InsertLib(); + void implExportLib( const String& aLibName, const String& aTargetURL, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ); - void Export(); - void ExportAsPackage( const String& aLibName ); - void ExportAsBasic( const String& aLibName ); - void EndTabDialog( USHORT nRet ); - void FillListBox(); + void Export(); + void ExportAsPackage( const String& aLibName ); + void ExportAsBasic( const String& aLibName ); + void EndTabDialog( USHORT nRet ); + void FillListBox(); void InsertListBoxEntry( const ScriptDocument& rDocument, LibraryLocation eLocation ); - void SetCurLib(); - SvLBoxEntry* ImpInsertLibEntry( const String& rLibName, ULONG nPos ); - virtual void ActivatePage(); - virtual void DeactivatePage(); + void SetCurLib(); + SvLBoxEntry* ImpInsertLibEntry( const String& rLibName, ULONG nPos ); + virtual void ActivatePage(); + virtual void DeactivatePage(); - TabDialog* pTabDlg; + TabDialog* pTabDlg; public: LibPage( Window* pParent ); - virtual ~LibPage(); + virtual ~LibPage(); - void SetTabDlg( TabDialog* p ) { pTabDlg = p;} + void SetTabDlg( TabDialog* p ) { pTabDlg = p;} }; // Helper functions SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument, BasicTreeListBox& rBasicBox, const String& rLibName, String aModName, bool bMain = false ); -void createLibImpl( Window* pWin, const ScriptDocument& rDocument, +void createLibImpl( Window* pWin, const ScriptDocument& rDocument, BasicCheckBox* pLibBox, BasicTreeListBox* pBasicBox ); #endif // _MODULDLG_HXX diff --git a/basctl/source/basicide/moduldlg.src b/basctl/source/basicide/moduldlg.src index a6ac943f29d0..78ebad8b267e 100644 --- a/basctl/source/basicide/moduldlg.src +++ b/basctl/source/basicide/moduldlg.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 @@ -40,7 +40,7 @@ TabDialog RID_TD_ORGANIZE // Da Cancel-Button auf TabPage, nicht auf Dialog! TabControl RID_TC_ORGANIZE { - // HelpID = HID_BASICIDE_ORG_TC; + // HelpID = HID_BASICIDE_ORG_TC; OutputSize = TRUE ; PageList = { @@ -64,7 +64,7 @@ TabDialog RID_TD_ORGANIZE }; TabPage RID_TP_MODULS { - // HelpId = HID_BASICIDE_MODULS ; + // HelpId = HID_BASICIDE_MODULS ; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 210 , 140 ) ; @@ -179,7 +179,7 @@ TabPage RID_TP_DLGS }; TabPage RID_TP_LIBS { - // HelpId = HID_BASICIDE_LIBS_TP ; + // HelpId = HID_BASICIDE_LIBS_TP ; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 210 , 140 ) ; @@ -211,7 +211,7 @@ TabPage RID_TP_LIBS Size = MAP_APPFONT ( 130 , 87 ) ; TabStop = TRUE ; }; - + PushButton RID_PB_EDIT { Text [ en-US ] = "~Edit"; @@ -235,7 +235,7 @@ TabPage RID_TP_LIBS Text [ en-US ] = "~Password..." ; TabStop = TRUE ; }; - + PushButton RID_PB_NEWLIB { Pos = MAP_APPFONT ( 144 , 69 ) ; @@ -268,7 +268,7 @@ TabPage RID_TP_LIBS }; ModalDialog RID_DLG_LIBS { - // HelpId = HID_BASICIDE_LIBS_DLG ; + // HelpId = HID_BASICIDE_LIBS_DLG ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 168 , 132 ) ; @@ -376,7 +376,7 @@ ModalDialog RID_DLG_EXPORT Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; }; - + RadioButton RB_EXPORTASPACKAGE { Pos = MAP_APPFONT( 6, 6 ); @@ -384,14 +384,14 @@ ModalDialog RID_DLG_EXPORT Group = TRUE; Text [ en-US ] = "Export as ~extension"; TabStop = TRUE ; - }; + }; RadioButton RB_EXPORTASBASIC { Pos = MAP_APPFONT( 6, 19 ); Size = MAP_APPFONT( 103, 10 ); //Group = TRUE; Text [ en-US ] = "Export as BASIC library"; - }; + }; }; String RID_STR_EXPORTPACKAGE @@ -408,4 +408,4 @@ String RID_STR_PACKAGE_BUNDLE { Text [ en-US ] = "Extension"; }; - + diff --git a/basctl/source/basicide/moptions.hrc b/basctl/source/basicide/moptions.hrc index 2636a39a8484..b57cbdedd15e 100644 --- a/basctl/source/basicide/moptions.hrc +++ b/basctl/source/basicide/moptions.hrc @@ -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 @@ -29,19 +29,19 @@ #include <svl/solar.hrc> -#define RID_MACROOPTIONS ( RID_BASICIDE_START + 55 ) +#define RID_MACROOPTIONS ( RID_BASICIDE_START + 55 ) -#define RID_FT_SBXNAME 2 -#define RID_PB_OK 3 -#define RID_PB_CANCEL 4 -#define RID_PB_HELP 5 -#define RID_FT_DESCR 6 -#define RID_ME_DESCR 7 -#define RID_FL_HELP 8 -#define RID_FT_HELPID 9 -#define RID_NF_HELPID 10 -#define RID_FT_HELPNAME 11 -#define RID_ED_HELPNAME 12 +#define RID_FT_SBXNAME 2 +#define RID_PB_OK 3 +#define RID_PB_CANCEL 4 +#define RID_PB_HELP 5 +#define RID_FT_DESCR 6 +#define RID_ME_DESCR 7 +#define RID_FL_HELP 8 +#define RID_FT_HELPID 9 +#define RID_NF_HELPID 10 +#define RID_FT_HELPNAME 11 +#define RID_ED_HELPNAME 12 #endif // _MOPTIONS_HRC diff --git a/basctl/source/basicide/moptions.src b/basctl/source/basicide/moptions.src index ef1be222095c..32cb236a0980 100644 --- a/basctl/source/basicide/moptions.src +++ b/basctl/source/basicide/moptions.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 @@ -29,7 +29,7 @@ #include <moptions.hrc> ModalDialog RID_MACROOPTIONS { - // HelpId = HID_MACRO_OPTIONS ; + // HelpId = HID_MACRO_OPTIONS ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 224 , 121 ) ; diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx index f3998287a2b8..6fc1bee100ce 100644 --- a/basctl/source/basicide/objdlg.cxx +++ b/basctl/source/basicide/objdlg.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 @@ -74,7 +74,7 @@ void ObjectTreeListBox::MouseButtonDown( const MouseEvent& rMEvt ) SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL; if( pDispatcher ) { - SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDesc.GetDocument(), aDesc.GetLibName(), aDesc.GetName(), + SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDesc.GetDocument(), aDesc.GetLibName(), aDesc.GetName(), aDesc.GetMethodName(), ConvertType( aDesc.GetType() ) ); pDispatcher->Execute( SID_BASICIDE_SHOWSBX, SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L ); @@ -97,7 +97,7 @@ ObjectCatalog::ObjectCatalog( Window * pParent ) aToolBox.SetSizePixel( aToolBox.CalcWindowSizePixel() ); aToolBox.SetSelectHdl( LINK( this, ObjectCatalog, ToolBoxHdl ) ); - aMacroTreeList.SetWindowBits( WB_HASLINES | WB_HASLINESATROOT | + aMacroTreeList.SetWindowBits( WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HSCROLL ); @@ -124,7 +124,7 @@ ObjectCatalog::ObjectCatalog( Window * pParent ) if ( aSize.Width() ) SetOutputSizePixel( aSize ); - Resize(); // damit der Resize-Handler die Controls anordnet + Resize(); // damit der Resize-Handler die Controls anordnet // make object catalog keyboard accessible pParent->GetSystemWindow()->GetTaskPaneList()->AddWindow( this ); @@ -193,13 +193,13 @@ IMPL_LINK( ObjectCatalog, ToolBoxHdl, ToolBox*, pToolBox ) BasicIDEShell* pIDEShell = IDE_DLL()->GetShell(); SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL; SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL; - if ( aDesc.GetType() == OBJ_TYPE_MODULE || + if ( aDesc.GetType() == OBJ_TYPE_MODULE || aDesc.GetType() == OBJ_TYPE_DIALOG || aDesc.GetType() == OBJ_TYPE_METHOD ) { if( pDispatcher ) { - SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDesc.GetDocument(), aDesc.GetLibName(), aDesc.GetName(), + SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDesc.GetDocument(), aDesc.GetLibName(), aDesc.GetName(), aDesc.GetMethodName(), aMacroTreeList.ConvertType( aDesc.GetType() ) ); pDispatcher->Execute( SID_BASICIDE_SHOWSBX, SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L ); @@ -265,7 +265,7 @@ void ObjectCatalog::UpdateEntries() } void ObjectCatalog::SetCurrentEntry( BasicEntryDescriptor& rDesc ) -{ +{ aMacroTreeList.SetCurrentEntry( rDesc ); } diff --git a/basctl/source/basicide/objdlg.hrc b/basctl/source/basicide/objdlg.hrc index 930ab31a4ae8..ea3ca222525b 100644 --- a/basctl/source/basicide/objdlg.hrc +++ b/basctl/source/basicide/objdlg.hrc @@ -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 @@ -29,12 +29,12 @@ #include <svl/solar.hrc> -#define RID_BASICIDE_OBJCAT ( RID_BASICIDE_START + 70 ) +#define RID_BASICIDE_OBJCAT ( RID_BASICIDE_START + 70 ) #define RID_FT_MACRODESCR 8 #define RID_IMGLST_TB_HC 9 -#define RID_TLB_MACROS 10 -#define RID_TB_TOOLBOX 11 +#define RID_TLB_MACROS 10 +#define RID_TB_TOOLBOX 11 -#define TBITEM_SHOW 1 +#define TBITEM_SHOW 1 #endif // _OBJDLG_HXX diff --git a/basctl/source/basicide/objdlg.hxx b/basctl/source/basicide/objdlg.hxx index cd48a135a882..96d541d49171 100644 --- a/basctl/source/basicide/objdlg.hxx +++ b/basctl/source/basicide/objdlg.hxx @@ -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 @@ -43,8 +43,8 @@ class ObjectTreeListBox : public BasicTreeListBox { private: - virtual void Command( const CommandEvent& rCEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void Command( const CommandEvent& rCEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); public: ObjectTreeListBox( Window* pParent, const ResId& rRes ); @@ -70,30 +70,30 @@ private: class ObjectCatalog : public FloatingWindow { private: - ObjectTreeListBox aMacroTreeList; + ObjectTreeListBox aMacroTreeList; ObjectCatalogToolBox_Impl aToolBox; - FixedText aMacroDescr; - Link aCancelHdl; + FixedText aMacroDescr; + Link aCancelHdl; protected: DECL_LINK( ToolBoxHdl, ToolBox* ); - void CheckButtons(); + void CheckButtons(); DECL_LINK( TreeListHighlightHdl, SvTreeListBox * ); - void UpdateFields(); - virtual void Move(); - virtual BOOL Close(); - virtual void Resize(); + void UpdateFields(); + virtual void Move(); + virtual BOOL Close(); + virtual void Resize(); public: ObjectCatalog( Window * pParent ); virtual ~ObjectCatalog(); - void UpdateEntries(); + void UpdateEntries(); void SetCurrentEntry( BasicEntryDescriptor& rDesc ); - void SetCancelHdl( const Link& rLink ) { aCancelHdl = rLink; } + void SetCancelHdl( const Link& rLink ) { aCancelHdl = rLink; } }; -#endif //_OBJDLG_HXX +#endif //_OBJDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/objdlg.src b/basctl/source/basicide/objdlg.src index c8de023dec53..b66b68a2dbd2 100644 --- a/basctl/source/basicide/objdlg.src +++ b/basctl/source/basicide/objdlg.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 @@ -28,7 +28,7 @@ #include <objdlg.hrc> #include <helpid.hrc> -#define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; }; +#define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; }; FloatingWindow RID_BASICIDE_OBJCAT { diff --git a/basctl/source/basicide/register.cxx b/basctl/source/basicide/register.cxx index 612a3dc1f303..212db9f239f8 100644 --- a/basctl/source/basicide/register.cxx +++ b/basctl/source/basicide/register.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 @@ -54,8 +54,8 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( } SAL_DLLPUBLIC_EXPORT -sal_Bool SAL_CALL component_writeInfo( void* pServiceManager , - void* pRegistryKey ) +sal_Bool SAL_CALL component_writeInfo( void* pServiceManager , + void* pRegistryKey ) { (void)pServiceManager; @@ -85,9 +85,9 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, // Set default return value for this operation - if it failed. void* pReturn = NULL ; - if ( - ( pImplementationName != NULL ) && - ( pServiceManager != NULL ) + if ( + ( pImplementationName != NULL ) && + ( pServiceManager != NULL ) ) { // Define variables which are used in following macros. diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx index bc21f4b3f556..f6c89a3f6505 100644 --- a/basctl/source/basicide/scriptdocument.cxx +++ b/basctl/source/basicide/scriptdocument.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 @@ -87,7 +87,7 @@ #include <rtl/uri.hxx> #include <rtl/bootstrap.hxx> - + #include <osl/process.h> #include <osl/file.hxx> @@ -262,7 +262,7 @@ namespace basctl getDocumentRef() const { return m_xDocument; } /// returns a library container belonging to the document - Reference< XLibraryContainer > + Reference< XLibraryContainer > getLibraryContainer( LibraryContainerType _eType ) const; /// determines whether a given library is part of the shared installation @@ -460,7 +460,7 @@ namespace basctl if ( xVBACompat.is() ) bResult = xVBACompat->getVBACompatibilityMode(); } - return bResult; + return bResult; } //-------------------------------------------------------------------- @@ -653,7 +653,7 @@ namespace basctl try { Reference< XNameContainer > xLib( getLibrary( _eType, _rLibName, TRUE ), UNO_QUERY_THROW ); - + // get element Any aElement( xLib->getByName( _rOldName ) ); @@ -1018,7 +1018,7 @@ namespace basctl ::rtl::OUString aSearchURL3( RTL_CONSTASCII_USTRINGPARAM( "share/extensions" ) ); if( aCanonicalFileURL.indexOf( aSearchURL1 ) != -1 || aCanonicalFileURL.indexOf( aSearchURL2 ) != -1 || - aCanonicalFileURL.indexOf( aSearchURL3 ) != -1 ) + aCanonicalFileURL.indexOf( aSearchURL3 ) != -1 ) bIsShared = true; } } @@ -1128,7 +1128,7 @@ namespace basctl ScriptDocument::~ScriptDocument() { } - + //-------------------------------------------------------------------- const ScriptDocument& ScriptDocument::getApplicationScriptDocument() { @@ -1253,7 +1253,7 @@ namespace basctl return aScriptDocs; } - + //-------------------------------------------------------------------- bool ScriptDocument::operator==( const ScriptDocument& _rhs ) const { @@ -1283,7 +1283,7 @@ namespace basctl { return m_pImpl->getLibraryContainer( _eType ); } - + //-------------------------------------------------------------------- Reference< XNameContainer > ScriptDocument::getLibrary( LibraryContainerType _eType, const ::rtl::OUString& _rLibName, bool _bLoadLibrary ) const SAL_THROW((NoSuchElementException)) diff --git a/basctl/source/basicide/tbxctl.cxx b/basctl/source/basicide/tbxctl.cxx index 3f3968524245..97ae12fd743f 100644 --- a/basctl/source/basicide/tbxctl.cxx +++ b/basctl/source/basicide/tbxctl.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 @@ -69,8 +69,8 @@ IMPL_LINK( PopupWindowTbx, SelectHdl, void*, EMPTYARG ) PopupWindowTbx::PopupWindowTbx( USHORT nId, WindowAlign eAlign, ResId aRIdWin, ResId aRIdTbx, SfxBindings& rBind ) : - SfxPopupWindow ( nId, aRIdWin, rBind ), - aTbx ( this, GetBindings(), aRIdTbx ) + SfxPopupWindow ( nId, aRIdWin, rBind ), + aTbx ( this, GetBindings(), aRIdTbx ) { FreeResource(); aTbx.Initialize(); @@ -181,7 +181,7 @@ void TbxControls::StateChanged( USHORT nSID, SfxItemState eState, { rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); aSlotURL += rtl::OUString::valueOf( sal_Int32( nTemp )); - Image aImage = GetImage( m_xFrame, + Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages(), GetToolBox().GetSettings().GetStyleSettings().GetHighContrastMode() ); @@ -214,7 +214,7 @@ void TbxControls::Select( USHORT nModifier ) |* rItemRect sind die Screen-Koordinaten |* \************************************************************************/ -SfxPopupWindow* TbxControls::CreatePopupWindow() +SfxPopupWindow* TbxControls::CreatePopupWindow() { if ( GetSlotId() == SID_CHOOSE_CONTROLS ) createAndPositionSubToolBar( aSubToolBarResName ); diff --git a/basctl/source/basicide/tbxctl.hrc b/basctl/source/basicide/tbxctl.hrc index 2765b5ba8c80..ea4a1e4711e1 100644 --- a/basctl/source/basicide/tbxctl.hrc +++ b/basctl/source/basicide/tbxctl.hrc @@ -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 @@ -26,5 +26,5 @@ ************************************************************************/ #include <svl/solar.hrc> -#define RID_TBXCONTROLS ( RID_BASICIDE_START + 65 ) -#define RID_TOOLBOX ( RID_BASICIDE_START + 66 ) +#define RID_TBXCONTROLS ( RID_BASICIDE_START + 65 ) +#define RID_TOOLBOX ( RID_BASICIDE_START + 66 ) diff --git a/basctl/source/basicide/tbxctl.hxx b/basctl/source/basicide/tbxctl.hxx index 6a1461c78640..5ed5d6798fda 100644 --- a/basctl/source/basicide/tbxctl.hxx +++ b/basctl/source/basicide/tbxctl.hxx @@ -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 @@ -39,8 +39,8 @@ class PopupWindowTbx : public SfxPopupWindow { private: - SfxToolBoxManager aTbx; - Link aSelectLink; + SfxToolBoxManager aTbx; + Link aSelectLink; DECL_LINK( SelectHdl, void* ); @@ -49,12 +49,12 @@ public: ResId aRIdWin, ResId aRIdTbx, SfxBindings& rBind ); ~PopupWindowTbx(); - void StartSelection() + void StartSelection() { aTbx.GetToolBox().StartSelection(); } - void Update(); + void Update(); - virtual SfxPopupWindow* Clone() const; - virtual void PopupModeEnd(); + virtual SfxPopupWindow* Clone() const; + virtual void PopupModeEnd(); }; #endif */ @@ -71,10 +71,10 @@ private: bool bDisabled; }; - USHORT nLastSlot; + USHORT nLastSlot; protected: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); public: SFX_DECL_TOOLBOX_CONTROL(); @@ -82,11 +82,11 @@ public: TbxControls(USHORT nSlotId, USHORT nId, ToolBox& rTbx ); ~TbxControls() {} - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + virtual SfxPopupWindowType GetPopupWindowType() const; + virtual SfxPopupWindow* CreatePopupWindow(); - using SfxToolBoxControl::Select; - void Select( USHORT nModifier ); + using SfxToolBoxControl::Select; + void Select( USHORT nModifier ); }; diff --git a/basctl/source/basicide/tbxctl.src b/basctl/source/basicide/tbxctl.src index 89d839619238..defe36e46ef8 100644 --- a/basctl/source/basicide/tbxctl.src +++ b/basctl/source/basicide/tbxctl.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/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx index ab61423b9314..a37331c01323 100644 --- a/basctl/source/basicide/unomodel.cxx +++ b/basctl/source/basicide/unomodel.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/basctl/source/basicide/unomodel.hxx b/basctl/source/basicide/unomodel.hxx index bb2b55889f0e..73ca3b0356a8 100644 --- a/basctl/source/basicide/unomodel.hxx +++ b/basctl/source/basicide/unomodel.hxx @@ -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 @@ -38,10 +38,10 @@ class SIDEModel : public SfxBaseModel, { public: SIDEModel( SfxObjectShell *pObjSh = 0 ); - virtual ~SIDEModel(); + virtual ~SIDEModel(); //XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire( ) throw(); virtual void SAL_CALL release( ) throw(); diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index 324d7d829153..bfb682e73a26 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.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 @@ -38,7 +38,7 @@ #include "dlgedclip.hxx" #include <dlgeddef.hxx> #include "propbrw.hxx" -#include <localizationmgr.hxx> +#include <localizationmgr.hxx> #include <basidesh.hxx> #include <iderdll.hxx> @@ -69,7 +69,7 @@ using namespace comphelper; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::io; +using namespace ::com::sun::star::io; using ::rtl::OUString; static ::rtl::OUString aResourceResolverPropName = @@ -176,7 +176,7 @@ void DlgEditor::ShowDialog() BOOL DlgEditor::UnmarkDialog() { - SdrObject* pDlgObj = pDlgEdModel->GetPage(0)->GetObj(0); + SdrObject* pDlgObj = pDlgEdModel->GetPage(0)->GetObj(0); SdrPageView* pPgView = pDlgEdView->GetSdrPageView(); BOOL bWasMarked = pDlgEdView->IsObjMarked( pDlgObj ); @@ -191,7 +191,7 @@ BOOL DlgEditor::UnmarkDialog() BOOL DlgEditor::RemarkDialog() { - SdrObject* pDlgObj = pDlgEdModel->GetPage(0)->GetObj(0); + SdrObject* pDlgObj = pDlgEdModel->GetPage(0)->GetObj(0); SdrPageView* pPgView = pDlgEdView->GetSdrPageView(); BOOL bWasMarked = pDlgEdView->IsObjMarked( pDlgObj ); @@ -220,7 +220,7 @@ DlgEditor::DlgEditor( const ::com::sun::star::uno::Reference< ::com::sun::star:: ,eMode( DLGED_SELECT ) ,eActObj( OBJ_DLG_PUSHBUTTON ) ,bFirstDraw(FALSE) - ,aGridSize( 100, 100 ) // 100TH_MM + ,aGridSize( 100, 100 ) // 100TH_MM ,bGridVisible(FALSE) ,bGridSnap(TRUE) ,bCreateOK(TRUE) @@ -244,14 +244,14 @@ DlgEditor::DlgEditor( const ::com::sun::star::uno::Reference< ::com::sun::star:: pFunc = new DlgEdFuncSelect( this ); // set clipboard data flavors - m_ClipboardDataFlavors[0].MimeType = ::rtl::OUString::createFromAscii("application/vnd.sun.xml.dialog"); - m_ClipboardDataFlavors[0].HumanPresentableName = ::rtl::OUString::createFromAscii("Dialog 6.0"); - m_ClipboardDataFlavors[0].DataType = ::getCppuType( (const Sequence< sal_Int8 >*) 0 ); + m_ClipboardDataFlavors[0].MimeType = ::rtl::OUString::createFromAscii("application/vnd.sun.xml.dialog"); + m_ClipboardDataFlavors[0].HumanPresentableName = ::rtl::OUString::createFromAscii("Dialog 6.0"); + m_ClipboardDataFlavors[0].DataType = ::getCppuType( (const Sequence< sal_Int8 >*) 0 ); - m_ClipboardDataFlavorsResource[0] = m_ClipboardDataFlavors[0]; - m_ClipboardDataFlavorsResource[1].MimeType = ::rtl::OUString::createFromAscii("application/vnd.sun.xml.dialogwithresource"); - m_ClipboardDataFlavorsResource[1].HumanPresentableName = ::rtl::OUString::createFromAscii("Dialog 8.0"); - m_ClipboardDataFlavorsResource[1].DataType = ::getCppuType( (const Sequence< sal_Int8 >*) 0 ); + m_ClipboardDataFlavorsResource[0] = m_ClipboardDataFlavors[0]; + m_ClipboardDataFlavorsResource[1].MimeType = ::rtl::OUString::createFromAscii("application/vnd.sun.xml.dialogwithresource"); + m_ClipboardDataFlavorsResource[1].HumanPresentableName = ::rtl::OUString::createFromAscii("Dialog 8.0"); + m_ClipboardDataFlavorsResource[1].DataType = ::getCppuType( (const Sequence< sal_Int8 >*) 0 ); aPaintTimer.SetTimeout( 1 ); aPaintTimer.SetTimeoutHdl( LINK( this, DlgEditor, PaintTimeout ) ); @@ -292,7 +292,7 @@ void DlgEditor::SetWindow( Window* pWindow_ ) pWindow_->SetMapMode( MapMode( MAP_100TH_MM ) ); pDlgEdPage->SetSize( pWindow_->PixelToLogic( Size( DLGED_PAGE_WIDTH_MIN, DLGED_PAGE_HEIGHT_MIN ) ) ); - pDlgEdView = new DlgEdView( pDlgEdModel, pWindow_, this ); + pDlgEdView = new DlgEdView( pDlgEdModel, pWindow_, this ); pDlgEdView->ShowSdrPage(pDlgEdView->GetModel()->GetPage(0)); pDlgEdView->SetLayerVisible( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "HiddenLayer" ) ), FALSE ); pDlgEdView->SetMoveSnapOnlyTopLeft( TRUE ); @@ -371,8 +371,8 @@ void DlgEditor::DoScroll( ScrollBar* ) // When scrolling, someone was rescuing the Wallpaper and forced the window scroll to // be done without background refresh. I do not know why, but that causes the repaint // problems. Taking that out. - // Wallpaper aOldBackground = pWindow->GetBackground(); - // pWindow->SetBackground(); + // Wallpaper aOldBackground = pWindow->GetBackground(); + // pWindow->SetBackground(); // #i74769# children should be scrolled pWindow->Scroll( -nX, -nY, SCROLL_CHILDREN); // SCROLL_NOCHILDREN ); @@ -416,7 +416,7 @@ void DlgEditor::SetDialog( uno::Reference< container::XNameContainer > xUnoContr pDlgEdModel->GetPage(0)->InsertObject( pDlgEdForm ); AdjustPageSize(); pDlgEdForm->SetRectFromProps(); - pDlgEdForm->UpdateTabIndices(); // for backward compatibility + pDlgEdForm->UpdateTabIndices(); // for backward compatibility pDlgEdForm->StartListening(); // create controls @@ -460,7 +460,7 @@ void DlgEditor::SetDialog( uno::Reference< container::XNameContainer > xUnoContr pDlgEdModel->GetPage(0)->InsertObject( pCtrlObj ); pCtrlObj->SetRectFromProps(); pCtrlObj->UpdateStep(); - pCtrlObj->StartListening(); + pCtrlObj->StartListening(); } } @@ -491,9 +491,9 @@ Reference< util::XNumberFormatsSupplier > const & DlgEditor::GetNumberFormatsSup if ( !m_xSupplier.is() ) { Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory(); - Reference< util::XNumberFormatsSupplier > xSupplier( xMSF->createInstance( + Reference< util::XNumberFormatsSupplier > xSupplier( xMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatsSupplier") ) ), UNO_QUERY ); - + ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if ( !m_xSupplier.is() ) { @@ -564,7 +564,7 @@ IMPL_LINK( DlgEditor, PaintTimeout, Timer *, EMPTYARG ) ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPSet(pDlgEdForm->GetUnoControlModel(), ::com::sun::star::uno::UNO_QUERY); if ( xPSet.is() ) - { + { // get dialog size from properties sal_Int32 nWidth = 0, nHeight = 0; xPSet->getPropertyValue( DLGED_PROP_WIDTH ) >>= nWidth; @@ -685,7 +685,7 @@ void DlgEditor::SetMode( DlgEdMode eNewMode ) else pFunc = new DlgEdFuncSelect( this ); - if ( eNewMode == DLGED_READONLY ) + if ( eNewMode == DLGED_READONLY ) pDlgEdModel->SetReadOnly( TRUE ); else pDlgEdModel->SetReadOnly( FALSE ); @@ -702,9 +702,9 @@ void DlgEditor::SetMode( DlgEdMode eNewMode ) void DlgEditor::SetInsertObj( USHORT eObj ) { eActObj = eObj; - + if( pDlgEdView ) - pDlgEdView->SetCurrentObj( eActObj, DlgInventor ); + pDlgEdView->SetCurrentObj( eActObj, DlgInventor ); } //---------------------------------------------------------------------------- @@ -762,7 +762,7 @@ void implCopyStreamToByteSequence( Reference< XInputStream > xStream, Sequence< sal_Int8 > readBytes; nRead = xStream->readBytes( readBytes, 1024 ); if (! nRead) - break; + break; sal_Int32 nPos = bytes.getLength(); bytes.realloc( nPos + nRead ); @@ -771,7 +771,7 @@ void implCopyStreamToByteSequence( Reference< XInputStream > xStream, } void DlgEditor::Copy() -{ +{ if( !pDlgEdView->AreObjectsMarked() ) return; @@ -797,7 +797,7 @@ void DlgEditor::Copy() } // insert control models of marked objects into clipboard dialog model - ULONG nMark = pDlgEdView->GetMarkedObjectList().GetMarkCount(); + ULONG nMark = pDlgEdView->GetMarkedObjectList().GetMarkCount(); for( ULONG i = 0; i < nMark; i++ ) { SdrObject* pObj = pDlgEdView->GetMarkedObjectList().GetMark(i)->GetMarkedSdrObj(); @@ -967,7 +967,7 @@ void DlgEditor::Paste() // create clipboard dialog model from xml Reference< lang::XMultiServiceFactory > xMSF = getProcessServiceFactory(); Reference< container::XNameContainer > xClipDialogModel( xMSF->createInstance - ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ) ), + ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ) ), uno::UNO_QUERY ); bool bSourceIsLocalized = false; @@ -1045,8 +1045,8 @@ void DlgEditor::Paste() Reference< awt::XControlModel > xCtrlModel( xClone->createClone(), uno::UNO_QUERY ); DlgEdObj* pCtrlObj = new DlgEdObj(); - pCtrlObj->SetDlgEdForm(pDlgEdForm); // set parent form - pDlgEdForm->AddChild(pCtrlObj); // add child to parent form + pCtrlObj->SetDlgEdForm(pDlgEdForm); // set parent form + pDlgEdForm->AddChild(pCtrlObj); // add child to parent form pCtrlObj->SetUnoControlModel( xCtrlModel ); // set control model // set new name @@ -1091,7 +1091,7 @@ void DlgEditor::Paste() pCtrlObj->SetRectFromProps(); pCtrlObj->UpdateStep(); pDlgEdForm->UpdateTabOrderAndGroups(); // #110559# - pCtrlObj->StartListening(); // start listening + pCtrlObj->StartListening(); // start listening // mark object SdrPageView* pPgView = pDlgEdView->GetSdrPageView(); @@ -1103,10 +1103,10 @@ void DlgEditor::Paste() Point aFormCenter = (pDlgEdForm->GetSnapRect()).Center(); Point aPoint = aFormCenter - aMarkCenter; Size aSize( aPoint.X() , aPoint.Y() ); - pDlgEdView->MoveMarkedObj( aSize ); // update of control model properties (position + size) in NbcMove + pDlgEdView->MoveMarkedObj( aSize ); // update of control model properties (position + size) in NbcMove pDlgEdView->MarkListHasChanged(); - // dialog model changed + // dialog model changed SetDialogModelChanged(TRUE); } } @@ -1122,7 +1122,7 @@ void DlgEditor::Delete() return; // remove control models of marked objects from dialog model - ULONG nMark = pDlgEdView->GetMarkedObjectList().GetMarkCount(); + ULONG nMark = pDlgEdView->GetMarkedObjectList().GetMarkCount(); for( ULONG i = 0; i < nMark; i++ ) { @@ -1176,7 +1176,7 @@ void DlgEditor::Delete() BOOL DlgEditor::IsPasteAllowed() { BOOL bPaste = FALSE; - + // get clipboard Reference< datatransfer::clipboard::XClipboard > xClipboard = GetWindow()->GetClipboard(); if ( xClipboard.is() ) @@ -1202,7 +1202,7 @@ BOOL DlgEditor::IsPasteAllowed() void DlgEditor::ShowProperties() { BasicIDEShell* pIDEShell = IDE_DLL()->GetShell(); - SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL; + SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL; if ( pViewFrame && !pViewFrame->HasChildWindow( SID_SHOW_PROPERTYBROWSER ) ) pViewFrame->ToggleChildWindow( SID_SHOW_PROPERTYBROWSER ); } @@ -1231,15 +1231,15 @@ void DlgEditor::ClearModifyFlag() //---------------------------------------------------------------------------- -#define LMARGPRN 1700 -#define RMARGPRN 900 -#define TMARGPRN 2000 -#define BMARGPRN 1000 -#define BORDERPRN 300 +#define LMARGPRN 1700 +#define RMARGPRN 900 +#define TMARGPRN 2000 +#define BMARGPRN 1000 +#define BORDERPRN 300 //---------------------------------------------------------------------------- -void lcl_PrintHeader( Printer* pPrinter, const String& rTitle ) // not working yet +void lcl_PrintHeader( Printer* pPrinter, const String& rTitle ) // not working yet { pPrinter->Push(); @@ -1293,7 +1293,7 @@ void DlgEditor::printPage( sal_Int32 nPage, Printer* pPrinter, const String& rTi //---------------------------------------------------------------------------- -void DlgEditor::Print( Printer* pPrinter, const String& rTitle ) // not working yet +void DlgEditor::Print( Printer* pPrinter, const String& rTitle ) // not working yet { if( pDlgEdView ) { diff --git a/basctl/source/dlged/dlgedclip.cxx b/basctl/source/dlged/dlgedclip.cxx index 17392b2510ac..06285b11f9ff 100644 --- a/basctl/source/dlged/dlgedclip.cxx +++ b/basctl/source/dlged/dlgedclip.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/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx index 27bae6fbb8c7..39531f21457f 100644 --- a/basctl/source/dlged/dlgedfac.cxx +++ b/basctl/source/dlged/dlgedfac.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 @@ -72,7 +72,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) } bNeedsInit = sal_False; } - + if( (pObjFactory->nInventor == DlgInventor) && (pObjFactory->nIdentifier >= OBJ_DLG_PUSHBUTTON) && (pObjFactory->nIdentifier <= OBJ_DLG_TREECONTROL) ) @@ -92,7 +92,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlListBoxModel") , xDialogSFact ); break; case OBJ_DLG_COMBOBOX: - { + { DlgEdObj* pNew = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlComboBoxModel") , xDialogSFact ); pObjFactory->pNewObj = pNew; try @@ -107,7 +107,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) catch(...) { } - } break; + } break; case OBJ_DLG_GROUPBOX: pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlGroupBoxModel") , xDialogSFact ); break; @@ -122,7 +122,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) break; case OBJ_DLG_PROGRESSBAR: pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlProgressBarModel") , xDialogSFact ); - break; + break; case OBJ_DLG_HSCROLLBAR: pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlScrollBarModel") , xDialogSFact ); break; @@ -130,7 +130,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) { DlgEdObj* pNew = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlScrollBarModel") , xDialogSFact ); pObjFactory->pNewObj = pNew; - // set vertical orientation + // set vertical orientation try { uno::Reference< beans::XPropertySet > xPSet(pNew->GetUnoControlModel(), uno::UNO_QUERY); @@ -144,7 +144,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) catch(...) { } - } break; + } break; case OBJ_DLG_HFIXEDLINE: pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFixedLineModel") , xDialogSFact ); break; @@ -152,7 +152,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) { DlgEdObj* pNew = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFixedLineModel") , xDialogSFact ); pObjFactory->pNewObj = pNew; - // set vertical orientation + // set vertical orientation try { uno::Reference< beans::XPropertySet > xPSet(pNew->GetUnoControlModel(), uno::UNO_QUERY); @@ -166,28 +166,28 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) catch(...) { } - } break; + } break; case OBJ_DLG_DATEFIELD: pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlDateFieldModel") , xDialogSFact ); - break; + break; case OBJ_DLG_TIMEFIELD: pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlTimeFieldModel") , xDialogSFact ); - break; + break; case OBJ_DLG_NUMERICFIELD: pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlNumericFieldModel") , xDialogSFact ); - break; + break; case OBJ_DLG_CURRENCYFIELD: pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlCurrencyFieldModel") , xDialogSFact ); - break; + break; case OBJ_DLG_FORMATTEDFIELD: pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFormattedFieldModel") , xDialogSFact ); - break; + break; case OBJ_DLG_PATTERNFIELD: pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlPatternFieldModel") , xDialogSFact ); - break; + break; case OBJ_DLG_FILECONTROL: pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFileControlModel") , xDialogSFact ); - break; + break; case OBJ_DLG_TREECONTROL: DlgEdObj* pNew = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.tree.TreeControlModel") , xDialogSFact ); pObjFactory->pNewObj = pNew; @@ -206,12 +206,12 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) // gets the service manager from the office Reference< XMultiComponentFactory > xMultiComponentFactoryServer( xComponentContext->getServiceManager() ); - + // gets the TreeDataModel Reference< XMutableTreeDataModel > xTreeDataModel; xTreeDataModel = Reference< XMutableTreeDataModel >( - xMultiComponentFactoryServer->createInstanceWithContext( + xMultiComponentFactoryServer->createInstanceWithContext( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.tree.MutableTreeDataModel" ) ), xComponentContext ), UNO_QUERY_THROW ); // now fill it with some sample data @@ -228,7 +228,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) xChildNode_1->setDataValue( sNode_1 ); xChildNode_1->setExpandedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_down.png" ) ) ); xChildNode_1->setCollapsedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_right.png" ) ) ); - + xNode->appendChild( xChildNode_1 ); const OUString sNode_1_1( RTL_CONSTASCII_USTRINGPARAM( "Node_1_1" ) ); @@ -237,7 +237,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) xChildNode_1_1->setDataValue( sNode_1_1 ); xChildNode_1_1->setExpandedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_down.png" ) ) ); xChildNode_1_1->setCollapsedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_right.png" ) ) ); - + xChildNode_1->appendChild( xChildNode_1_1 ); const OUString sNode_1_1( RTL_CONSTASCII_USTRINGPARAM( "Node_2" ) ); @@ -246,10 +246,10 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) xChildNode_2->setDataValue( sNode_2 ); xChildNode_2->setNodeGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM("private:graphicrepository/sw/imglst/nc20010.png") ) ); xNode->appendChild( xChildNode_2 ); - + xTreeDataModel->setRoot( xNode ); - - + + const OUString sDataModel( RTL_CONSTASCII_USTRINGPARAM( "DataModel" ) ); xPSet->setPropertyValue( sDataModel, xTreeDataModel ); @@ -258,7 +258,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) catch(...) { }*/ - break; + break; } } diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx index 9ef46deb69c0..702af3c6a0d8 100644 --- a/basctl/source/dlged/dlgedfunc.cxx +++ b/basctl/source/dlged/dlgedfunc.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 @@ -160,7 +160,7 @@ BOOL DlgEdFunc::KeyInput( const KeyEvent& rKEvt ) ((SdrHdlList&)rHdlList).ResetFocusHdl(); else pView->UnmarkAll(); - + bReturn = TRUE; } } @@ -314,7 +314,7 @@ BOOL DlgEdFunc::KeyInput( const KeyEvent& rKEvt ) pView->MovAction( aEndPoint ); pView->EndDragObj(); - + // restore snap if ( !bWasNoSnap ) ((SdrDragStat&)rDragStat).SetNoSnap( bWasNoSnap ); @@ -414,7 +414,7 @@ BOOL DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt ) pParent->ShowProperties(); } - return TRUE; + return TRUE; } //---------------------------------------------------------------------------- @@ -451,7 +451,7 @@ BOOL DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt ) if ( pView->IsDragObj() ) pView->EndDragObj( rMEvt.IsMod1() ); return TRUE; - } + } } //---------------------------------------------------------------------------- @@ -462,7 +462,7 @@ BOOL DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt ) Window* pWindow= pParent->GetWindow(); pView->SetActualWin( pWindow ); - Point aPos( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); + Point aPos( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); USHORT nHitLog = USHORT ( pWindow->PixelToLogic(Size(3,0)).Width() ); if ( pView->IsAction() ) @@ -524,9 +524,9 @@ BOOL DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt ) if( pView->PickObj( aMDPos, nHitLog, pObj, pPV ) ) { //if( pObj->ISA( DlgEdForm ) ) - // pView->UnmarkAll(); + // pView->UnmarkAll(); //else - // pParent->UnmarkDialog(); + // pParent->UnmarkDialog(); } } @@ -585,22 +585,22 @@ BOOL DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt ) } } -// USHORT nClicks = rMEvt.GetClicks(); -// if (nClicks == 2) -// { -// if ( pView->AreObjectsMarked() ) -// { -// const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); +// USHORT nClicks = rMEvt.GetClicks(); +// if (nClicks == 2) +// { +// if ( pView->AreObjectsMarked() ) +// { +// const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); // -// if (rMarkList.GetMarkCount() == 1) -// { -// SdrMark* pMark = rMarkList.GetMark(0); -// SdrObject* pObj = pMark->GetMarkedSdrObj(); +// if (rMarkList.GetMarkCount() == 1) +// { +// SdrMark* pMark = rMarkList.GetMark(0); +// SdrObject* pObj = pMark->GetMarkedSdrObj(); // -// // edit objects here -// } -// } -// } +// // edit objects here +// } +// } +// } bMarkAction = FALSE; diff --git a/basctl/source/dlged/dlgedlist.cxx b/basctl/source/dlged/dlgedlist.cxx index 41fa01b262c8..ff34ca8a346a 100644 --- a/basctl/source/dlged/dlgedlist.cxx +++ b/basctl/source/dlged/dlgedlist.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/basctl/source/dlged/dlgedmod.cxx b/basctl/source/dlged/dlgedmod.cxx index ceb5555a1bc2..3afcd86d79a2 100644 --- a/basctl/source/dlged/dlgedmod.cxx +++ b/basctl/source/dlged/dlgedmod.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/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index 769290fe0690..f956f817e0b0 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -827,7 +827,7 @@ sal_Bool DlgEdObj::supportsService( const sal_Char* _pServiceName ) const do { aUniqueName = aDefaultName + ::rtl::OUString::valueOf(++n); - } while (xNameAcc->hasByName(aUniqueName)); + } while (xNameAcc->hasByName(aUniqueName)); } return aUniqueName; diff --git a/basctl/source/dlged/dlgedpage.cxx b/basctl/source/dlged/dlgedpage.cxx index 58fe333dfac3..a327bac760f7 100644 --- a/basctl/source/dlged/dlgedpage.cxx +++ b/basctl/source/dlged/dlgedpage.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/basctl/source/dlged/dlgedview.cxx b/basctl/source/dlged/dlgedview.cxx index d98967a3e776..335974554282 100644 --- a/basctl/source/dlged/dlgedview.cxx +++ b/basctl/source/dlged/dlgedview.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 @@ -173,12 +173,12 @@ SdrObject* impLocalHitCorrection(SdrObject* pRetval, const Point& rPnt, USHORT n // will access aOutRect directly const Rectangle aOuterRectangle(pDlgEdObj->GetLastBoundRect()); - if(!aOuterRectangle.IsEmpty() - && RECT_EMPTY != aOuterRectangle.Right() + if(!aOuterRectangle.IsEmpty() + && RECT_EMPTY != aOuterRectangle.Right() && RECT_EMPTY != aOuterRectangle.Bottom()) { basegfx::B2DRange aOuterRange( - aOuterRectangle.Left(), aOuterRectangle.Top(), + aOuterRectangle.Left(), aOuterRectangle.Top(), aOuterRectangle.Right(), aOuterRectangle.Bottom()); if(nTol) diff --git a/basctl/source/dlged/dlgresid.src b/basctl/source/dlged/dlgresid.src index ee37d82233e1..4512dc75247e 100644 --- a/basctl/source/dlged/dlgresid.src +++ b/basctl/source/dlged/dlgresid.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/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index e33e68c3dd67..f39ebb0ccbb8 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.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 @@ -72,7 +72,7 @@ namespace { long getLongestWordWidth( const String& rText, const Window& rWin ) { long nWidth = 0; - Reference< XBreakIterator > xBreakIter( vcl::unohelper::CreateBreakIterator() ); + Reference< XBreakIterator > xBreakIter( vcl::unohelper::CreateBreakIterator() ); sal_Int32 nStartPos = 0; const Locale aLocale = Application::GetSettings().GetUILocale(); Boundary aBoundary = xBreakIter->getWordBoundary( @@ -99,19 +99,19 @@ ManageLanguageDialog::ManageLanguageDialog( Window* pParent, LocalizationMgr* _p ModalDialog( pParent, IDEResId( RID_DLG_MANAGE_LANGUAGE ) ), - m_aLanguageFT ( this, IDEResId( FT_LANGUAGE ) ), - m_aLanguageLB ( this, IDEResId( LB_LANGUAGE ) ), - m_aAddPB ( this, IDEResId( PB_ADD_LANG ) ), - m_aDeletePB ( this, IDEResId( PB_DEL_LANG ) ), - m_aMakeDefPB ( this, IDEResId( PB_MAKE_DEFAULT ) ), - m_aInfoFT ( this, IDEResId( FT_INFO ) ), - m_aBtnLine ( this, IDEResId( FL_BUTTONS ) ), - m_aHelpBtn ( this, IDEResId( PB_HELP ) ), - m_aCloseBtn ( this, IDEResId( PB_CLOSE ) ), - m_pLocalizationMgr ( _pLMgr ), - m_sDefLangStr ( IDEResId( STR_DEF_LANG ) ), - m_sDeleteStr ( IDEResId( STR_DELETE ) ), - m_sCreateLangStr ( IDEResId( STR_CREATE_LANG ) ) + m_aLanguageFT ( this, IDEResId( FT_LANGUAGE ) ), + m_aLanguageLB ( this, IDEResId( LB_LANGUAGE ) ), + m_aAddPB ( this, IDEResId( PB_ADD_LANG ) ), + m_aDeletePB ( this, IDEResId( PB_DEL_LANG ) ), + m_aMakeDefPB ( this, IDEResId( PB_MAKE_DEFAULT ) ), + m_aInfoFT ( this, IDEResId( FT_INFO ) ), + m_aBtnLine ( this, IDEResId( FL_BUTTONS ) ), + m_aHelpBtn ( this, IDEResId( PB_HELP ) ), + m_aCloseBtn ( this, IDEResId( PB_CLOSE ) ), + m_pLocalizationMgr ( _pLMgr ), + m_sDefLangStr ( IDEResId( STR_DEF_LANG ) ), + m_sDeleteStr ( IDEResId( STR_DELETE ) ), + m_sCreateLangStr ( IDEResId( STR_CREATE_LANG ) ) { FreeResource(); @@ -304,14 +304,14 @@ SetDefaultLanguageDialog::SetDefaultLanguageDialog( Window* pParent, Localizatio ModalDialog( pParent, IDEResId( RID_DLG_SETDEF_LANGUAGE ) ), - m_aLanguageFT ( this, IDEResId( FT_DEF_LANGUAGE ) ), - m_pLanguageLB ( new SvxLanguageBox( this, IDEResId( LB_DEF_LANGUAGE ) ) ), - m_pCheckLangLB ( NULL ), - m_aInfoFT ( this, IDEResId( FT_DEF_INFO ) ), - m_aBtnLine ( this, IDEResId( FL_DEF_BUTTONS ) ), - m_aOKBtn ( this, IDEResId( PB_DEF_OK ) ), - m_aCancelBtn ( this, IDEResId( PB_DEF_CANCEL ) ), - m_aHelpBtn ( this, IDEResId( PB_DEF_HELP ) ), + m_aLanguageFT ( this, IDEResId( FT_DEF_LANGUAGE ) ), + m_pLanguageLB ( new SvxLanguageBox( this, IDEResId( LB_DEF_LANGUAGE ) ) ), + m_pCheckLangLB ( NULL ), + m_aInfoFT ( this, IDEResId( FT_DEF_INFO ) ), + m_aBtnLine ( this, IDEResId( FL_DEF_BUTTONS ) ), + m_aOKBtn ( this, IDEResId( PB_DEF_OK ) ), + m_aCancelBtn ( this, IDEResId( PB_DEF_CANCEL ) ), + m_aHelpBtn ( this, IDEResId( PB_DEF_HELP ) ), m_pLocalizationMgr( _pLMgr ) diff --git a/basctl/source/dlged/managelang.hrc b/basctl/source/dlged/managelang.hrc index e3a7f7f1edde..6abb2ae3b314 100644 --- a/basctl/source/dlged/managelang.hrc +++ b/basctl/source/dlged/managelang.hrc @@ -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 @@ -34,73 +34,73 @@ // Dialog Control Id's ----------------------------------------------------------- -#define FT_LANGUAGE 1 -#define LB_LANGUAGE 2 -#define PB_ADD_LANG 3 -#define PB_DEL_LANG 4 -#define PB_MAKE_DEFAULT 5 -#define FT_INFO 6 -#define FL_BUTTONS 7 -#define PB_HELP 8 -#define PB_CLOSE 9 -#define STR_DEF_LANG 10 -#define STR_DELETE 11 -#define STR_CREATE_LANG 12 - -#define FT_DEF_LANGUAGE 1 -#define LB_DEF_LANGUAGE 2 -#define LB_ADD_LANGUAGE 3 -#define FT_DEF_INFO 4 -#define FL_DEF_BUTTONS 5 -#define PB_DEF_OK 6 -#define PB_DEF_CANCEL 7 -#define PB_DEF_HELP 8 -#define STR_ADDLANG_TITLE 9 -#define STR_ADDLANG_LABEL 10 -#define STR_ADDLANG_INFO 11 +#define FT_LANGUAGE 1 +#define LB_LANGUAGE 2 +#define PB_ADD_LANG 3 +#define PB_DEL_LANG 4 +#define PB_MAKE_DEFAULT 5 +#define FT_INFO 6 +#define FL_BUTTONS 7 +#define PB_HELP 8 +#define PB_CLOSE 9 +#define STR_DEF_LANG 10 +#define STR_DELETE 11 +#define STR_CREATE_LANG 12 + +#define FT_DEF_LANGUAGE 1 +#define LB_DEF_LANGUAGE 2 +#define LB_ADD_LANGUAGE 3 +#define FT_DEF_INFO 4 +#define FL_DEF_BUTTONS 5 +#define PB_DEF_OK 6 +#define PB_DEF_CANCEL 7 +#define PB_DEF_HELP 8 +#define STR_ADDLANG_TITLE 9 +#define STR_ADDLANG_LABEL 10 +#define STR_ADDLANG_INFO 11 // Metrics ----------------------------------------------------------------------- -#define MANAGE_DLG_WIDTH 240 -#define MANAGE_DLG_HEIGHT 180 -#define INFO_LINES_COUNT 3 +#define MANAGE_DLG_WIDTH 240 +#define MANAGE_DLG_HEIGHT 180 +#define INFO_LINES_COUNT 3 -#define MANAGE_COL1 RSC_SP_DLG_INNERBORDER_LEFT -#define MANAGE_COL2 (MANAGE_DLG_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT - 2*RSC_CD_PUSHBUTTON_WIDTH - RSC_SP_CTRL_X) -#define MANAGE_COL3 (MANAGE_COL2 + RSC_CD_PUSHBUTTON_WIDTH + RSC_SP_CTRL_X) +#define MANAGE_COL1 RSC_SP_DLG_INNERBORDER_LEFT +#define MANAGE_COL2 (MANAGE_DLG_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT - 2*RSC_CD_PUSHBUTTON_WIDTH - RSC_SP_CTRL_X) +#define MANAGE_COL3 (MANAGE_COL2 + RSC_CD_PUSHBUTTON_WIDTH + RSC_SP_CTRL_X) -#define MANAGE_ROW1 RSC_SP_DLG_INNERBORDER_TOP -#define MANAGE_ROW2 (MANAGE_ROW1 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y) -#define MANAGE_ROW3 (MANAGE_ROW2 + RSC_CD_PUSHBUTTON_HEIGHT + RSC_SP_CTRL_GROUP_Y) +#define MANAGE_ROW1 RSC_SP_DLG_INNERBORDER_TOP +#define MANAGE_ROW2 (MANAGE_ROW1 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y) +#define MANAGE_ROW3 (MANAGE_ROW2 + RSC_CD_PUSHBUTTON_HEIGHT + RSC_SP_CTRL_GROUP_Y) -#define MANAGE_ROW7 (MANAGE_DLG_HEIGHT - RSC_SP_DLG_INNERBORDER_BOTTOM - RSC_CD_PUSHBUTTON_HEIGHT) -#define MANAGE_ROW6 (MANAGE_ROW7 - RSC_SP_FLGR_SPACE_Y - RSC_CD_FIXEDLINE_HEIGHT) -#define MANAGE_ROW5 (MANAGE_ROW6 - RSC_SP_FLGR_SPACE_Y - INFO_LINES_COUNT*RSC_CD_FIXEDTEXT_HEIGHT) -#define MANAGE_ROW4 (MANAGE_ROW5 - RSC_SP_CTRL_GROUP_Y - RSC_CD_PUSHBUTTON_HEIGHT) -#define MANAGE_ROW4A (MANAGE_ROW4 + RSC_CD_PUSHBUTTON_HEIGHT) +#define MANAGE_ROW7 (MANAGE_DLG_HEIGHT - RSC_SP_DLG_INNERBORDER_BOTTOM - RSC_CD_PUSHBUTTON_HEIGHT) +#define MANAGE_ROW6 (MANAGE_ROW7 - RSC_SP_FLGR_SPACE_Y - RSC_CD_FIXEDLINE_HEIGHT) +#define MANAGE_ROW5 (MANAGE_ROW6 - RSC_SP_FLGR_SPACE_Y - INFO_LINES_COUNT*RSC_CD_FIXEDTEXT_HEIGHT) +#define MANAGE_ROW4 (MANAGE_ROW5 - RSC_SP_CTRL_GROUP_Y - RSC_CD_PUSHBUTTON_HEIGHT) +#define MANAGE_ROW4A (MANAGE_ROW4 + RSC_CD_PUSHBUTTON_HEIGHT) -#define MANAGE_LB_WIDTH (MANAGE_COL3 - RSC_SP_CTRL_X - RSC_SP_DLG_INNERBORDER_LEFT) -#define MANAGE_LB_HEIGHT (MANAGE_ROW4A - MANAGE_ROW2) +#define MANAGE_LB_WIDTH (MANAGE_COL3 - RSC_SP_CTRL_X - RSC_SP_DLG_INNERBORDER_LEFT) +#define MANAGE_LB_HEIGHT (MANAGE_ROW4A - MANAGE_ROW2) -#define SETDEF_DLG_WIDTH 180 -#define SETDEF_DLG_HEIGHT 165 +#define SETDEF_DLG_WIDTH 180 +#define SETDEF_DLG_HEIGHT 165 -#define SETDEF_COL1 RSC_SP_DLG_INNERBORDER_LEFT -#define SETDEF_COL2 (SETDEF_DLG_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT - 3*RSC_CD_PUSHBUTTON_WIDTH - RSC_SP_CTRL_GROUP_X - RSC_SP_CTRL_X) -#define SETDEF_COL3 (SETDEF_COL2 + RSC_CD_PUSHBUTTON_WIDTH + RSC_SP_CTRL_GROUP_X) -#define SETDEF_COL4 (SETDEF_COL3 + RSC_CD_PUSHBUTTON_WIDTH + RSC_SP_CTRL_X) -#define SETDEF_COL4A (SETDEF_COL4 + RSC_CD_PUSHBUTTON_WIDTH) +#define SETDEF_COL1 RSC_SP_DLG_INNERBORDER_LEFT +#define SETDEF_COL2 (SETDEF_DLG_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT - 3*RSC_CD_PUSHBUTTON_WIDTH - RSC_SP_CTRL_GROUP_X - RSC_SP_CTRL_X) +#define SETDEF_COL3 (SETDEF_COL2 + RSC_CD_PUSHBUTTON_WIDTH + RSC_SP_CTRL_GROUP_X) +#define SETDEF_COL4 (SETDEF_COL3 + RSC_CD_PUSHBUTTON_WIDTH + RSC_SP_CTRL_X) +#define SETDEF_COL4A (SETDEF_COL4 + RSC_CD_PUSHBUTTON_WIDTH) -#define SETDEF_ROW1 RSC_SP_DLG_INNERBORDER_TOP -#define SETDEF_ROW2 (SETDEF_ROW1 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y) +#define SETDEF_ROW1 RSC_SP_DLG_INNERBORDER_TOP +#define SETDEF_ROW2 (SETDEF_ROW1 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y) -#define SETDEF_ROW5 (SETDEF_DLG_HEIGHT - RSC_SP_DLG_INNERBORDER_BOTTOM - RSC_CD_PUSHBUTTON_HEIGHT) -#define SETDEF_ROW4 (SETDEF_ROW5 - RSC_SP_FLGR_SPACE_Y - RSC_CD_FIXEDLINE_HEIGHT) -#define SETDEF_ROW3 (SETDEF_ROW4 - RSC_SP_FLGR_SPACE_Y - INFO_LINES_COUNT*RSC_CD_FIXEDTEXT_HEIGHT) -#define SETDEF_ROW3A (SETDEF_ROW3 - RSC_SP_CTRL_GROUP_Y) +#define SETDEF_ROW5 (SETDEF_DLG_HEIGHT - RSC_SP_DLG_INNERBORDER_BOTTOM - RSC_CD_PUSHBUTTON_HEIGHT) +#define SETDEF_ROW4 (SETDEF_ROW5 - RSC_SP_FLGR_SPACE_Y - RSC_CD_FIXEDLINE_HEIGHT) +#define SETDEF_ROW3 (SETDEF_ROW4 - RSC_SP_FLGR_SPACE_Y - INFO_LINES_COUNT*RSC_CD_FIXEDTEXT_HEIGHT) +#define SETDEF_ROW3A (SETDEF_ROW3 - RSC_SP_CTRL_GROUP_Y) -#define SETDEF_LB_WIDTH (SETDEF_COL4A - SETDEF_COL1) -#define SETDEF_LB_HEIGHT (SETDEF_ROW3A - SETDEF_ROW2) +#define SETDEF_LB_WIDTH (SETDEF_COL4A - SETDEF_COL1) +#define SETDEF_LB_HEIGHT (SETDEF_ROW3A - SETDEF_ROW2) -#endif // _BASCTL_MANAGELANG_HRC +#endif // _BASCTL_MANAGELANG_HRC diff --git a/basctl/source/dlged/managelang.src b/basctl/source/dlged/managelang.src index b03421e1aa22..6b54abcb182a 100644 --- a/basctl/source/dlged/managelang.src +++ b/basctl/source/dlged/managelang.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/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx index d210482a8ef5..a041c8e7a343 100644 --- a/basctl/source/dlged/propbrw.cxx +++ b/basctl/source/dlged/propbrw.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 @@ -83,7 +83,7 @@ SFX_IMPL_FLOATINGWINDOW(PropBrwMgr, SID_SHOW_PROPERTYBROWSER) //---------------------------------------------------------------------------- -PropBrwMgr::PropBrwMgr( Window* _pParent, sal_uInt16 nId, +PropBrwMgr::PropBrwMgr( Window* _pParent, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo* pInfo) :SfxChildWindow( _pParent, nId ) { @@ -197,7 +197,7 @@ void PropBrw::ImplReCreateController() xFactoryProperties->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ), UNO_QUERY_THROW ); - // a ComponentContext for the + // a ComponentContext for the ::cppu::ContextEntry_Init aHandlerContextInfo[] = { ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DialogParentWindow" ) ), makeAny( VCLUnoHelper::GetInterface ( this ) ) ), @@ -503,8 +503,8 @@ void PropBrw::implSetNewObject( const Reference< XPropertySet >& _rxObject ) // #i73075 Handled in implSetNewObjectSequence //else // multiselection //{ - // aName = ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_PROPERTIES))); - // aName += ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_MULTISELECT))); + // aName = ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_PROPERTIES))); + // aName += ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_MULTISELECT))); //} return aName; diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx index f45e4eb31e44..fca313610f02 100644 --- a/basctl/source/inc/accessibledialogcontrolshape.hxx +++ b/basctl/source/inc/accessibledialogcontrolshape.hxx @@ -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,53 +48,53 @@ class AccessibleStateSetHelper; } -// ---------------------------------------------------- -// class AccessibleDialogControlShape -// ---------------------------------------------------- +// ---------------------------------------------------- +// class AccessibleDialogControlShape +// ---------------------------------------------------- -typedef ::comphelper::OAccessibleExtendedComponentHelper AccessibleExtendedComponentHelper_BASE; +typedef ::comphelper::OAccessibleExtendedComponentHelper AccessibleExtendedComponentHelper_BASE; typedef ::cppu::ImplHelper3< ::com::sun::star::accessibility::XAccessible, ::com::sun::star::lang::XServiceInfo, ::com::sun::star::beans::XPropertyChangeListener > AccessibleDialogControlShape_BASE; -class AccessibleDialogControlShape : public AccessibleExtendedComponentHelper_BASE, +class AccessibleDialogControlShape : public AccessibleExtendedComponentHelper_BASE, public AccessibleDialogControlShape_BASE { friend class AccessibleDialogWindow; private: - VCLExternalSolarLock* m_pExternalLock; - DialogWindow* m_pDialogWindow; - DlgEdObj* m_pDlgEdObj; - sal_Bool m_bFocused; - sal_Bool m_bSelected; + VCLExternalSolarLock* m_pExternalLock; + DialogWindow* m_pDialogWindow; + DlgEdObj* m_pDlgEdObj; + sal_Bool m_bFocused; + sal_Bool m_bSelected; - ::com::sun::star::awt::Rectangle m_aBounds; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xControlModel; + ::com::sun::star::awt::Rectangle m_aBounds; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xControlModel; protected: - sal_Bool IsFocused(); - sal_Bool IsSelected(); + sal_Bool IsFocused(); + sal_Bool IsSelected(); - void SetFocused( sal_Bool bFocused ); - void SetSelected( sal_Bool bSelected ); + void SetFocused( sal_Bool bFocused ); + void SetSelected( sal_Bool bSelected ); ::com::sun::star::awt::Rectangle GetBounds(); - void SetBounds( const ::com::sun::star::awt::Rectangle& aBounds ); + void SetBounds( const ::com::sun::star::awt::Rectangle& aBounds ); - Window* GetWindow() const; + Window* GetWindow() const; - ::rtl::OUString GetModelStringProperty( const sal_Char* pPropertyName ); + ::rtl::OUString GetModelStringProperty( const sal_Char* pPropertyName ); - virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); + virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); - // OCommonAccessibleComponent - virtual ::com::sun::star::awt::Rectangle SAL_CALL implGetBounds( ) throw (::com::sun::star::uno::RuntimeException); + // OCommonAccessibleComponent + virtual ::com::sun::star::awt::Rectangle SAL_CALL implGetBounds( ) throw (::com::sun::star::uno::RuntimeException); // XComponent - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing(); public: AccessibleDialogControlShape( DialogWindow* pDialogWindow, DlgEdObj* pDlgEdObj ); @@ -139,7 +139,7 @@ public: virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); // XAccessibleExtendedComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx index ed8594a5c071..c5ed48faf733 100644 --- a/basctl/source/inc/accessibledialogwindow.hxx +++ b/basctl/source/inc/accessibledialogwindow.hxx @@ -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,18 +52,18 @@ class AccessibleStateSetHelper; } -// ---------------------------------------------------- -// class AccessibleDialogWindow -// ---------------------------------------------------- +// ---------------------------------------------------- +// class AccessibleDialogWindow +// ---------------------------------------------------- -typedef ::comphelper::OAccessibleExtendedComponentHelper AccessibleExtendedComponentHelper_BASE; +typedef ::comphelper::OAccessibleExtendedComponentHelper AccessibleExtendedComponentHelper_BASE; -typedef ::cppu::ImplHelper3 < +typedef ::cppu::ImplHelper3 < ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleSelection, ::com::sun::star::lang::XServiceInfo > AccessibleDialogWindow_BASE; -class AccessibleDialogWindow : public AccessibleExtendedComponentHelper_BASE, +class AccessibleDialogWindow : public AccessibleExtendedComponentHelper_BASE, public AccessibleDialogWindow_BASE, public SfxListener { @@ -72,9 +72,9 @@ private: class ChildDescriptor { public: - DlgEdObj* pDlgEdObj; - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > rxAccessible; - + DlgEdObj* pDlgEdObj; + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > rxAccessible; + ChildDescriptor( DlgEdObj* _pDlgEdObj ); ~ChildDescriptor(); @@ -87,35 +87,35 @@ private: typedef ::std::vector< ChildDescriptor > AccessibleChildren; - AccessibleChildren m_aAccessibleChildren; - VCLExternalSolarLock* m_pExternalLock; - DialogWindow* m_pDialogWindow; - DlgEditor* m_pDlgEditor; - DlgEdModel* m_pDlgEdModel; + AccessibleChildren m_aAccessibleChildren; + VCLExternalSolarLock* m_pExternalLock; + DialogWindow* m_pDialogWindow; + DlgEditor* m_pDlgEditor; + DlgEdModel* m_pDlgEdModel; protected: - void UpdateFocused(); - void UpdateSelected(); - void UpdateBounds(); + void UpdateFocused(); + void UpdateSelected(); + void UpdateBounds(); - sal_Bool IsChildVisible( const ChildDescriptor& rDesc ); + sal_Bool IsChildVisible( const ChildDescriptor& rDesc ); - void InsertChild( const ChildDescriptor& rDesc ); - void RemoveChild( const ChildDescriptor& rDesc ); - void UpdateChild( const ChildDescriptor& rDesc ); - void UpdateChildren(); - void SortChildren(); + void InsertChild( const ChildDescriptor& rDesc ); + void RemoveChild( const ChildDescriptor& rDesc ); + void UpdateChild( const ChildDescriptor& rDesc ); + void UpdateChildren(); + void SortChildren(); DECL_LINK( WindowEventListener, VclSimpleEvent* ); - virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); - virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); + virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); + virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); - // OCommonAccessibleComponent - virtual ::com::sun::star::awt::Rectangle SAL_CALL implGetBounds( ) throw (::com::sun::star::uno::RuntimeException); + // OCommonAccessibleComponent + virtual ::com::sun::star::awt::Rectangle SAL_CALL implGetBounds( ) throw (::com::sun::star::uno::RuntimeException); // XComponent - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing(); public: AccessibleDialogWindow( DialogWindow* pDialogWindow ); @@ -157,7 +157,7 @@ public: virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); // XAccessibleExtendedComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx index 505998d32bcb..cbfee7069976 100644 --- a/basctl/source/inc/baside3.hxx +++ b/basctl/source/inc/baside3.hxx @@ -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 @@ -50,27 +50,27 @@ class SfxUndoManager; class DialogWindow: public IDEBaseWindow { private: - DlgEditor* pEditor; - SfxUndoManager* pUndoMgr; - Link aOldNotifyUndoActionHdl; - String aCurPath; + DlgEditor* pEditor; + SfxUndoManager* pUndoMgr; + Link aOldNotifyUndoActionHdl; + String aCurPath; protected: - virtual void Paint( const Rectangle& ); - virtual void Resize(); + virtual void Paint( const Rectangle& ); + virtual void Resize(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void LoseFocus(); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void Command( const CommandEvent& rCEvt ); + virtual void LoseFocus(); DECL_LINK( NotifyUndoActionHdl, SfxUndoAction * ); - virtual void DoInit(); - virtual void DoScroll( ScrollBar* pCurScrollBar ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - void InitSettings(BOOL bFont,BOOL bForeground,BOOL bBackground); + virtual void DoInit(); + virtual void DoScroll( ScrollBar* pCurScrollBar ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); + void InitSettings(BOOL bFont,BOOL bForeground,BOOL bBackground); public: TYPEINFO(); @@ -79,38 +79,38 @@ public: DialogWindow( DialogWindow* pCurView ); // never implemented ~DialogWindow(); - virtual void ExecuteCommand( SfxRequest& rReq ); - virtual void GetState( SfxItemSet& ); - DlgEditor* GetEditor() const { return pEditor; } - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > GetDialog() const; - DlgEdModel* GetModel() const; - DlgEdPage* GetPage() const; - DlgEdView* GetView() const; - BOOL RenameDialog( const String& rNewName ); - void DisableBrowser(); - void UpdateBrowser(); - BOOL SaveDialog(); - BOOL ImportDialog(); - - virtual String GetTitle(); + virtual void ExecuteCommand( SfxRequest& rReq ); + virtual void GetState( SfxItemSet& ); + DlgEditor* GetEditor() const { return pEditor; } + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > GetDialog() const; + DlgEdModel* GetModel() const; + DlgEdPage* GetPage() const; + DlgEdView* GetView() const; + BOOL RenameDialog( const String& rNewName ); + void DisableBrowser(); + void UpdateBrowser(); + BOOL SaveDialog(); + BOOL ImportDialog(); + + virtual String GetTitle(); virtual BasicEntryDescriptor CreateEntryDescriptor(); - virtual void SetReadOnly( BOOL bReadOnly ); + virtual void SetReadOnly( BOOL bReadOnly ); virtual BOOL IsReadOnly(); - virtual void StoreData(); - virtual BOOL IsModified(); + virtual void StoreData(); + virtual BOOL IsModified(); virtual BOOL IsPasteAllowed(); - virtual SfxUndoManager* GetUndoManager(); + virtual SfxUndoManager* GetUndoManager(); // return number of pages to be printed virtual sal_Int32 countPages( Printer* pPrinter ); // print page virtual void printPage( sal_Int32 nPage, Printer* pPrinter ); - virtual void Deactivating(); + virtual void Deactivating(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); }; -#endif // _BASIDE3_HXX +#endif // _BASIDE3_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/inc/basidectrlr.hxx b/basctl/source/inc/basidectrlr.hxx index 8532b7691c74..172afbfb95b5 100644 --- a/basctl/source/inc/basidectrlr.hxx +++ b/basctl/source/inc/basidectrlr.hxx @@ -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,12 +47,12 @@ private: // properties sal_Int32 m_nIconId; -public: +public: BasicIDEController( BasicIDEShell* pViewShell ); virtual ~BasicIDEController(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); @@ -71,6 +71,6 @@ protected: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; }; -#endif // _BASCTL_BASICIDECTRLR_HXX +#endif // _BASCTL_BASICIDECTRLR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index 9fb76f628f7b..6f20a10b9cf9 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -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,22 +82,22 @@ friend class LocalizationMgr; friend BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocument& rDocument, const String& aLibName ); friend bool BasicIDE::RemoveDialog( const ScriptDocument& rDocument, const String& rLibName, const String& rDlgName ); - ObjectCatalog* pObjectCatalog; + ObjectCatalog* pObjectCatalog; - IDEWindowTable aIDEWindowTable; - USHORT nCurKey; - IDEBaseWindow* pCurWin; + IDEWindowTable aIDEWindowTable; + USHORT nCurKey; + IDEBaseWindow* pCurWin; ScriptDocument m_aCurDocument; String m_aCurLibName; - LocalizationMgr* m_pCurLocalizationMgr; - - ScrollBar aHScrollBar; - ScrollBar aVScrollBar; - ScrollBarBox aScrollBarBox; - BasicIDETabBar* pTabBar; - BOOL bTabBarSplitted; - BOOL bCreatingWindow; - ModulWindowLayout* pModulLayout; + LocalizationMgr* m_pCurLocalizationMgr; + + ScrollBar aHScrollBar; + ScrollBar aVScrollBar; + ScrollBarBox aScrollBarBox; + BasicIDETabBar* pTabBar; + BOOL bTabBarSplitted; + BOOL bCreatingWindow; + ModulWindowLayout* pModulLayout; BOOL m_bAppBasicModified; ::basctl::DocumentEventNotifier m_aNotifier; @@ -105,21 +105,21 @@ friend class ContainerListenerImpl; ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener > m_xLibListener; #if _SOLAR__PRIVATE - void Init(); - void InitTabBar(); - void InitScrollBars(); - void CheckWindows(); - void RemoveWindows( const ScriptDocument& rDocument, const String& rLibName, BOOL bDestroy ); - void UpdateWindows(); - void ShowObjectDialog( BOOL bShow, BOOL bCreateOrDestroy ); - void InvalidateBasicIDESlots(); - void StoreAllWindowData( BOOL bPersistent = TRUE ); - void SetMDITitle(); - void EnableScrollbars( BOOL bEnable ); + void Init(); + void InitTabBar(); + void InitScrollBars(); + void CheckWindows(); + void RemoveWindows( const ScriptDocument& rDocument, const String& rLibName, BOOL bDestroy ); + void UpdateWindows(); + void ShowObjectDialog( BOOL bShow, BOOL bCreateOrDestroy ); + void InvalidateBasicIDESlots(); + void StoreAllWindowData( BOOL bPersistent = TRUE ); + void SetMDITitle(); + void EnableScrollbars( BOOL bEnable ); void SetCurLib( const ScriptDocument& rDocument, String aLibName, bool bUpdateWindows = true , bool bCheck = true ); - void SetCurLibForLocalization( const ScriptDocument& rDocument, String aLibName ); + void SetCurLibForLocalization( const ScriptDocument& rDocument, String aLibName ); - void ImplStartListening( StarBASIC* pBasic ); + void ImplStartListening( StarBASIC* pBasic ); DECL_LINK( TabBarHdl, TabBar* ); DECL_LINK( AccelSelectHdl, Accelerator* ); @@ -128,35 +128,35 @@ friend class ContainerListenerImpl; #endif protected: - virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ); - virtual void OuterResizePixel( const Point &rPos, const Size &rSize ); - virtual Size GetOptimalSizePixel() const; - USHORT InsertWindowInTable( IDEBaseWindow* pNewWin ); - virtual USHORT PrepareClose( BOOL bUI, BOOL bForBrowsing ); - - void SetCurWindow( IDEBaseWindow* pNewWin, BOOL bUpdateTabBar = FALSE, BOOL bRememberAsCurrent = TRUE ); - void ManageToolbars(); - void RemoveWindow( IDEBaseWindow* pWindow, BOOL bDestroy, BOOL bAllowChangeCurWindow = TRUE ); - void ArrangeTabBar(); - - ModulWindow* CreateBasWin( const ScriptDocument& rDocument, const String& rLibName, const String& rModName ); + virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ); + virtual void OuterResizePixel( const Point &rPos, const Size &rSize ); + virtual Size GetOptimalSizePixel() const; + USHORT InsertWindowInTable( IDEBaseWindow* pNewWin ); + virtual USHORT PrepareClose( BOOL bUI, BOOL bForBrowsing ); + + void SetCurWindow( IDEBaseWindow* pNewWin, BOOL bUpdateTabBar = FALSE, BOOL bRememberAsCurrent = TRUE ); + void ManageToolbars(); + void RemoveWindow( IDEBaseWindow* pWindow, BOOL bDestroy, BOOL bAllowChangeCurWindow = TRUE ); + void ArrangeTabBar(); + + ModulWindow* CreateBasWin( const ScriptDocument& rDocument, const String& rLibName, const String& rModName ); DialogWindow* CreateDlgWin( const ScriptDocument& rDocument, const String& rLibName, const String& rDlgName ); - ModulWindow* FindBasWin( const ScriptDocument& rDocument, const String& rLibName, const String& rModName, BOOL bCreateIfNotExist, BOOL bFindSuspended = FALSE ); - ModulWindow* ShowActiveModuleWindow( StarBASIC* pBasic ); + ModulWindow* FindBasWin( const ScriptDocument& rDocument, const String& rLibName, const String& rModName, BOOL bCreateIfNotExist, BOOL bFindSuspended = FALSE ); + ModulWindow* ShowActiveModuleWindow( StarBASIC* pBasic ); - virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, + virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType ); - virtual void Activate(BOOL bMDI); - virtual void Deactivate(BOOL bMDI); + virtual void Activate(BOOL bMDI); + virtual void Deactivate(BOOL bMDI); - virtual void Move(); - virtual void ShowCursor( bool bOn = true ); + virtual void Move(); + virtual void ShowCursor( bool bOn = true ); - void CreateModulWindowLayout(); - void DestroyModulWindowLayout(); - void UpdateModulWindowLayout( bool bBasicStopped ); + void CreateModulWindowLayout(); + void DestroyModulWindowLayout(); + void UpdateModulWindowLayout( bool bBasicStopped ); // DocumentEventListener virtual void onDocumentCreated( const ScriptDocument& _rDocument ); @@ -177,57 +177,57 @@ public: BasicIDEShell( SfxViewFrame *pFrame, SfxViewShell *pOldSh ); ~BasicIDEShell(); - IDEBaseWindow* GetCurWindow() const { return pCurWin; } + IDEBaseWindow* GetCurWindow() const { return pCurWin; } const ScriptDocument& GetCurDocument() const { return m_aCurDocument; } const String& GetCurLibName() const { return m_aCurLibName; } - ObjectCatalog* GetObjectCatalog() const { return pObjectCatalog; } - LocalizationMgr* GetCurLocalizationMgr() const { return m_pCurLocalizationMgr; } + ObjectCatalog* GetObjectCatalog() const { return pObjectCatalog; } + LocalizationMgr* GetCurLocalizationMgr() const { return m_pCurLocalizationMgr; } - ScrollBar& GetHScrollBar() { return aHScrollBar; } - ScrollBar& GetVScrollBar() { return aVScrollBar; } - ScrollBarBox& GetScrollBarBox() { return aScrollBarBox; } - TabBar* GetTabBar() { return (TabBar*)pTabBar; } - IDEWindowTable& GetIDEWindowTable() { return aIDEWindowTable; } + ScrollBar& GetHScrollBar() { return aHScrollBar; } + ScrollBar& GetVScrollBar() { return aVScrollBar; } + ScrollBarBox& GetScrollBarBox() { return aScrollBarBox; } + TabBar* GetTabBar() { return (TabBar*)pTabBar; } + IDEWindowTable& GetIDEWindowTable() { return aIDEWindowTable; } - SdrView* GetCurDlgView() const; + SdrView* GetCurDlgView() const; - SfxUndoManager* GetUndoManager(); + SfxUndoManager* GetUndoManager(); virtual com::sun::star::uno::Reference< com::sun::star::view::XRenderable > GetRenderable(); + + // virtual USHORT Print( SfxProgress &rProgress, BOOL bIsAPI, PrintDialog *pPrintDialog = 0 ); + virtual SfxPrinter* GetPrinter( BOOL bCreate ); + virtual USHORT SetPrinter( SfxPrinter *pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ); + virtual String GetSelectionText( BOOL bCompleteWords ); + virtual BOOL HasSelection( BOOL bText ) const; - // virtual USHORT Print( SfxProgress &rProgress, BOOL bIsAPI, PrintDialog *pPrintDialog = 0 ); - virtual SfxPrinter* GetPrinter( BOOL bCreate ); - virtual USHORT SetPrinter( SfxPrinter *pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ); - virtual String GetSelectionText( BOOL bCompleteWords ); - virtual BOOL HasSelection( BOOL bText ) const; - - void GetState( SfxItemSet& ); - void ExecuteGlobal( SfxRequest& rReq ); - void ExecuteCurrent( SfxRequest& rReq ); - void ExecuteBasic( SfxRequest& rReq ); - void ExecuteDialog( SfxRequest& rReq ); + void GetState( SfxItemSet& ); + void ExecuteGlobal( SfxRequest& rReq ); + void ExecuteCurrent( SfxRequest& rReq ); + void ExecuteBasic( SfxRequest& rReq ); + void ExecuteDialog( SfxRequest& rReq ); - virtual sal_Bool HasUIFeature( sal_uInt32 nFeature ); + virtual sal_Bool HasUIFeature( sal_uInt32 nFeature ); - long CallBasicErrorHdl( StarBASIC* pBasic ); - long CallBasicBreakHdl( StarBASIC* pBasic ); + long CallBasicErrorHdl( StarBASIC* pBasic ); + long CallBasicBreakHdl( StarBASIC* pBasic ); - ModulWindowLayout* GetLayoutWindow() const { return pModulLayout; } + ModulWindowLayout* GetLayoutWindow() const { return pModulLayout; } - IDEBaseWindow* FindWindow( const ScriptDocument& rDocument, const String& rLibName = String(), const String& rName = String(), USHORT nType = BASICIDE_TYPE_UNKNOWN, BOOL bFindSuspended = FALSE ); + IDEBaseWindow* FindWindow( const ScriptDocument& rDocument, const String& rLibName = String(), const String& rName = String(), USHORT nType = BASICIDE_TYPE_UNKNOWN, BOOL bFindSuspended = FALSE ); DialogWindow* FindDlgWin( const ScriptDocument& rDocument, const String& rLibName, const String& rDlgName, BOOL bCreateIfNotExist, BOOL bFindSuspended = FALSE ); - IDEBaseWindow* FindApplicationWindow(); - BOOL NextPage( BOOL bPrev = FALSE ); - - BOOL IsAppBasicModified() const { return m_bAppBasicModified; } - void SetAppBasicModified( BOOL bModified = TRUE ) { m_bAppBasicModified = bModified; } + IDEBaseWindow* FindApplicationWindow(); + BOOL NextPage( BOOL bPrev = FALSE ); + + BOOL IsAppBasicModified() const { return m_bAppBasicModified; } + void SetAppBasicModified( BOOL bModified = TRUE ) { m_bAppBasicModified = bModified; } // For Dialog Drag&Drop in Dialog Organizer static void CopyDialogResources( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStreamProvider >& io_xISP, const ScriptDocument& rSourceDoc, const String& rSourceLibName, const ScriptDocument& rDestDoc, - const String& rDestLibName, const String& rDlgName ); + const String& rDestLibName, const String& rDlgName ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetCurrentDocument() const; diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx index c5c6f44587b9..3640d2140a13 100644 --- a/basctl/source/inc/basobj.hxx +++ b/basctl/source/inc/basobj.hxx @@ -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 @@ -50,26 +50,26 @@ struct BasicIDE_Impl; namespace BasicIDE { - void Organize( INT16 tabId ); + void Organize( INT16 tabId ); // Hilfsmethoden fuer den allg. Gebrauch: - SbMethod* CreateMacro( SbModule* pModule, const String& rMacroName ); - void RunMethod( SbMethod* pMethod ); + SbMethod* CreateMacro( SbModule* pModule, const String& rMacroName ); + void RunMethod( SbMethod* pMethod ); - StarBASIC* FindBasic( const SbxVariable* pVar ); - void StopBasic(); + StarBASIC* FindBasic( const SbxVariable* pVar ); + void StopBasic(); long HandleBasicError( StarBASIC* pBasic ); - void BasicStopped( BOOL* pbAppWindowDisabled = 0, BOOL* pbDispatcherLocked = 0, USHORT* pnWaitCount = 0, + void BasicStopped( BOOL* pbAppWindowDisabled = 0, BOOL* pbDispatcherLocked = 0, USHORT* pnWaitCount = 0, SfxUInt16Item** ppSWActionCount = 0, SfxUInt16Item** ppSWLockViewCount = 0 ); - BOOL IsValidSbxName( const String& rName ); + BOOL IsValidSbxName( const String& rName ); - BasicManager* FindBasicManager( StarBASIC* pLib ); + BasicManager* FindBasicManager( StarBASIC* pLib ); - SfxBindings* GetBindingsPtr(); + SfxBindings* GetBindingsPtr(); - void InvalidateDebuggerSlots(); + void InvalidateDebuggerSlots(); // libraries @@ -79,7 +79,7 @@ namespace BasicIDE // new methods for modules - ::rtl::OUString GetModule( + ::rtl::OUString GetModule( const ScriptDocument& rDocument, const String& rLibName, const String& rModName ) throw( ::com::sun::star::container::NoSuchElementException ); @@ -93,14 +93,14 @@ namespace BasicIDE // new methods for macros - ::rtl::OUString ChooseMacro( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxLimitToDocument, + ::rtl::OUString ChooseMacro( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxLimitToDocument, BOOL bChooseOnly, const ::rtl::OUString& rMacroDesc ); ::com::sun::star::uno::Sequence< ::rtl::OUString > GetMethodNames( const ScriptDocument& rDocument, const String& rLibName, const String& rModName ) throw( ::com::sun::star::container::NoSuchElementException ); - BOOL HasMethod( + BOOL HasMethod( const ScriptDocument& rDocument, const String& rLibName, const String& rModName, const String& rMethName ); // new methods for dialogs @@ -113,16 +113,16 @@ namespace BasicIDE Will show an error message when renaming fails because the new name is already used. */ - bool RenameDialog( + bool RenameDialog( Window* pErrorParent, const ScriptDocument& rDocument, const String& rLibName, const String& rOldName, const String& rNewName ) throw( ::com::sun::star::container::ElementExistException, ::com::sun::star::container::NoSuchElementException ); - bool RemoveDialog( + bool RemoveDialog( const ScriptDocument& rDocument, const String& rLibName, const String& rDlgName ); - void MarkDocumentModified( const ScriptDocument& rDocument ); + void MarkDocumentModified( const ScriptDocument& rDocument ); } -#endif // _BASOBJ_HXX +#endif // _BASOBJ_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx index 2d9ded65fef1..2b03fb2c57aa 100644 --- a/basctl/source/inc/bastypes.hxx +++ b/basctl/source/inc/bastypes.hxx @@ -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 @@ -55,8 +55,8 @@ class SfxItemSet; #include <hash_map> -#define LINE_SEP_CR 0x0D -#define LINE_SEP 0x0A +#define LINE_SEP_CR 0x0D +#define LINE_SEP 0x0A // Implementation: baside2b.cxx sal_Int32 searchEOL( const ::rtl::OUString& rStr, sal_Int32 fromIndex ); @@ -71,39 +71,39 @@ sal_Int32 searchEOL( const ::rtl::OUString& rStr, sal_Int32 fromIndex ); struct BasicStatus { -// BOOL bCompiled : 1; - BOOL bIsRunning : 1; - BOOL bError : 1; - BOOL bIsInReschedule : 1; - USHORT nBasicFlags; +// BOOL bCompiled : 1; + BOOL bIsRunning : 1; + BOOL bError : 1; + BOOL bIsInReschedule : 1; + USHORT nBasicFlags; - BasicStatus() { + BasicStatus() { bIsRunning = FALSE; bError = FALSE; nBasicFlags = 0; bIsInReschedule = FALSE; } }; struct BreakPoint { - BOOL bEnabled; - BOOL bTemp; - ULONG nLine; - ULONG nStopAfter; + BOOL bEnabled; + BOOL bTemp; + ULONG nLine; + ULONG nStopAfter; ULONG nHitCount; - BreakPoint( ULONG nL ) { nLine = nL; nStopAfter = 0; nHitCount = 0; bEnabled = TRUE; bTemp = FALSE; } + BreakPoint( ULONG nL ) { nLine = nL; nStopAfter = 0; nHitCount = 0; bEnabled = TRUE; bTemp = FALSE; } }; class BasicDockingWindow : public DockingWindow { - Rectangle aFloatingPosAndSize; + Rectangle aFloatingPosAndSize; protected: - virtual BOOL Docking( const Point& rPos, Rectangle& rRect ); - virtual void EndDocking( const Rectangle& rRect, BOOL bFloatMode ); + virtual BOOL Docking( const Point& rPos, Rectangle& rRect ); + virtual void EndDocking( const Rectangle& rRect, BOOL bFloatMode ); virtual void ToggleFloatingMode(); - virtual BOOL PrepareToggleFloatingMode(); - virtual void StartDocking(); + virtual BOOL PrepareToggleFloatingMode(); + virtual void StartDocking(); public: BasicDockingWindow( Window* pParent ); @@ -126,10 +126,10 @@ public: void transfer(BreakPointList & rList); - void InsertSorted( BreakPoint* pBrk ); - BreakPoint* FindBreakPoint( ULONG nLine ); - void AdjustBreakPoints( ULONG nLine, BOOL bInserted ); - void SetBreakPointsInBasic( SbModule* pModule ); + void InsertSorted( BreakPoint* pBrk ); + BreakPoint* FindBreakPoint( ULONG nLine ); + void AdjustBreakPoints( ULONG nLine, BOOL bInserted ); + void SetBreakPointsInBasic( SbModule* pModule ); void ResetHitCount(); }; @@ -137,8 +137,8 @@ public: class TabBarSortHelper { public: - USHORT nPageId; - String aPageText; + USHORT nPageId; + String aPageText; bool operator<(const TabBarSortHelper& rComp) const { return (aPageText.CompareIgnoreCaseToAscii( rComp.aPageText ) == COMPARE_LESS); } }; @@ -146,23 +146,23 @@ public: class BasicIDETabBar : public TabBar { protected: - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Command( const CommandEvent& rCEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void Command( const CommandEvent& rCEvt ); - virtual long AllowRenaming(); - virtual void EndRenaming(); + virtual long AllowRenaming(); + virtual void EndRenaming(); public: BasicIDETabBar( Window* pParent ); - void Sort(); + void Sort(); }; -#define BASWIN_OK 0x00 -#define BASWIN_RUNNINGBASIC 0x01 -#define BASWIN_TOBEKILLED 0x02 -#define BASWIN_SUSPENDED 0x04 -#define BASWIN_INRESCHEDULE 0x08 +#define BASWIN_OK 0x00 +#define BASWIN_RUNNINGBASIC 0x01 +#define BASWIN_TOBEKILLED 0x02 +#define BASWIN_SUSPENDED 0x04 +#define BASWIN_INRESCHEDULE 0x08 class Printer; class SfxUndoManager; @@ -171,82 +171,82 @@ class BasicEntryDescriptor; class IDEBaseWindow : public Window { private: - ScrollBar* pShellHScrollBar; - ScrollBar* pShellVScrollBar; + ScrollBar* pShellHScrollBar; + ScrollBar* pShellVScrollBar; DECL_LINK( ScrollHdl, ScrollBar * ); - BYTE nStatus; + BYTE nStatus; ScriptDocument m_aDocument; - String m_aLibName; - String m_aName; + String m_aLibName; + String m_aName; protected: - virtual void DoScroll( ScrollBar* pCurScrollBar ); + virtual void DoScroll( ScrollBar* pCurScrollBar ); public: TYPEINFO(); IDEBaseWindow( Window* pParent, const ScriptDocument& rDocument, String aLibName, String aName ); - virtual ~IDEBaseWindow(); + virtual ~IDEBaseWindow(); - void Init(); - virtual void DoInit(); - virtual void Deactivating(); - void GrabScrollBars( ScrollBar* pHScroll, ScrollBar* pVScroll ); + void Init(); + virtual void DoInit(); + virtual void Deactivating(); + void GrabScrollBars( ScrollBar* pHScroll, ScrollBar* pVScroll ); - ScrollBar* GetHScrollBar() const { return pShellHScrollBar; } - ScrollBar* GetVScrollBar() const { return pShellVScrollBar; } + ScrollBar* GetHScrollBar() const { return pShellHScrollBar; } + ScrollBar* GetVScrollBar() const { return pShellVScrollBar; } - virtual void ExecuteCommand( SfxRequest& rReq ); - virtual void GetState( SfxItemSet& ); + virtual void ExecuteCommand( SfxRequest& rReq ); + virtual void GetState( SfxItemSet& ); virtual long Notify( NotifyEvent& rNEvt ); - virtual void StoreData(); - virtual void UpdateData(); - virtual BOOL CanClose(); - + virtual void StoreData(); + virtual void UpdateData(); + virtual BOOL CanClose(); + // return number of pages to be printed virtual sal_Int32 countPages( Printer* pPrinter ) = 0; // print page virtual void printPage( sal_Int32 nPage, Printer* pPrinter ) = 0; - virtual String GetTitle(); - String CreateQualifiedName(); + virtual String GetTitle(); + String CreateQualifiedName(); virtual BasicEntryDescriptor CreateEntryDescriptor() = 0; - virtual BOOL IsModified(); + virtual BOOL IsModified(); virtual BOOL IsPasteAllowed(); - virtual BOOL AllowUndo(); + virtual BOOL AllowUndo(); - virtual void SetReadOnly( BOOL bReadOnly ); + virtual void SetReadOnly( BOOL bReadOnly ); virtual BOOL IsReadOnly(); - BYTE GetStatus() { return nStatus; } - void SetStatus( BYTE n ) { nStatus = n; } - void AddStatus( BYTE n ) { nStatus = nStatus | n; } - void ClearStatus( BYTE n ) { nStatus = nStatus & ~n; } + BYTE GetStatus() { return nStatus; } + void SetStatus( BYTE n ) { nStatus = n; } + void AddStatus( BYTE n ) { nStatus = nStatus | n; } + void ClearStatus( BYTE n ) { nStatus = nStatus & ~n; } - virtual Window* GetLayoutWindow(); + virtual Window* GetLayoutWindow(); - virtual SfxUndoManager* GetUndoManager(); + virtual SfxUndoManager* GetUndoManager(); - virtual USHORT GetSearchOptions(); + virtual USHORT GetSearchOptions(); - virtual void BasicStarted(); - virtual void BasicStopped(); + virtual void BasicStarted(); + virtual void BasicStopped(); - BOOL IsSuspended() const + BOOL IsSuspended() const { return ( nStatus & BASWIN_SUSPENDED ) ? TRUE : FALSE; } const ScriptDocument& GetDocument() const { return m_aDocument; } - void SetDocument( const ScriptDocument& rDocument ) { m_aDocument = rDocument; } + void SetDocument( const ScriptDocument& rDocument ) { m_aDocument = rDocument; } bool IsDocument( const ScriptDocument& rDocument ) const { return rDocument == m_aDocument; } - const String& GetLibName() const { return m_aLibName; } - void SetLibName( const String& aLibName ) { m_aLibName = aLibName; } - const String& GetName() const { return m_aName; } - void SetName( const String& aName ) { m_aName = aName; } + const String& GetLibName() const { return m_aLibName; } + void SetLibName( const String& aLibName ) { m_aLibName = aLibName; } + const String& GetName() const { return m_aName; } + void SetName( const String& aName ) { m_aName = aName; } }; class LibInfoKey @@ -275,7 +275,7 @@ private: ScriptDocument m_aDocument; String m_aLibName; String m_aCurrentName; - USHORT m_nCurrentType; + USHORT m_nCurrentType; public: LibInfoItem( const ScriptDocument& rDocument, const String& rLibName, const String& rCurrentName, USHORT nCurrentType ); @@ -319,14 +319,14 @@ public: }; void CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, BOOL bEraseTrailingEmptyLines = FALSE ); -String CreateMgrAndLibStr( const String& rMgrName, const String& rLibName ); -ULONG CalcLineCount( SvStream& rStream ); +String CreateMgrAndLibStr( const String& rMgrName, const String& rLibName ); +ULONG CalcLineCount( SvStream& rStream ); BOOL QueryReplaceMacro( const String& rName, Window* pParent = 0 ); -BOOL QueryDelMacro( const String& rName, Window* pParent = 0 ); -BOOL QueryDelDialog( const String& rName, Window* pParent = 0 ); -BOOL QueryDelModule( const String& rName, Window* pParent = 0 ); -BOOL QueryDelLib( const String& rName, BOOL bRef = FALSE, Window* pParent = 0 ); +BOOL QueryDelMacro( const String& rName, Window* pParent = 0 ); +BOOL QueryDelDialog( const String& rName, Window* pParent = 0 ); +BOOL QueryDelModule( const String& rName, Window* pParent = 0 ); +BOOL QueryDelLib( const String& rName, BOOL bRef = FALSE, Window* pParent = 0 ); BOOL QueryPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& xLibContainer, const String& rLibName, String& rPassword, BOOL bRepeat = FALSE, BOOL bNewTitle = FALSE ); class ModuleInfoHelper @@ -338,6 +338,6 @@ public: static void getObjectName( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rLib, const String& rModName, String& rObjName ); static sal_Int32 getModuleType( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rLib, const String& rModName ); }; -#endif // _BASTYPES_HXX +#endif // _BASTYPES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx index 67cff8dc7232..e4afea26798a 100644 --- a/basctl/source/inc/dlged.hxx +++ b/basctl/source/inc/dlged.hxx @@ -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 @@ -35,7 +35,7 @@ #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/frame/XModel.hpp> #include <tools/link.hxx> -#include <tools/gen.hxx> +#include <tools/gen.hxx> #include <vcl/timer.hxx> #include <svl/hint.hxx> #include <svl/brdcst.hxx> @@ -62,8 +62,8 @@ class DlgEdObj; class DlgEdHint: public SfxHint { private: - DlgEdHintKind eHintKind; - DlgEdObj* pDlgEdObj; + DlgEdHintKind eHintKind; + DlgEdObj* pDlgEdObj; public: TYPEINFO(); @@ -71,8 +71,8 @@ public: DlgEdHint( DlgEdHintKind eHint, DlgEdObj* pObj ); virtual ~DlgEdHint(); - DlgEdHintKind GetKind() const { return eHintKind; } - DlgEdObj* GetObject() const { return pDlgEdObj; } + DlgEdHintKind GetKind() const { return eHintKind; } + DlgEdObj* GetObject() const { return pDlgEdObj; } }; @@ -104,32 +104,32 @@ private: void Print( Printer* pPrinter, const String& rTitle ); protected: - ScrollBar* pHScroll; - ScrollBar* pVScroll; - DlgEdModel* pDlgEdModel; - DlgEdPage* pDlgEdPage; - DlgEdView* pDlgEdView; - DlgEdForm* pDlgEdForm; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xUnoControlDialogModel; + ScrollBar* pHScroll; + ScrollBar* pVScroll; + DlgEdModel* pDlgEdModel; + DlgEdPage* pDlgEdPage; + DlgEdView* pDlgEdView; + DlgEdForm* pDlgEdForm; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xUnoControlDialogModel; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > m_xControlContainer; - ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > m_ClipboardDataFlavors; - ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > m_ClipboardDataFlavorsResource; + ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > m_ClipboardDataFlavors; + ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > m_ClipboardDataFlavorsResource; ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xSupplier; - DlgEdFactory* pObjFac; - Window* pWindow; - DlgEdFunc* pFunc; - DlgEdMode eMode; - USHORT eActObj; - BOOL bFirstDraw; - Size aGridSize; - BOOL bGridVisible; - BOOL bGridSnap; - BOOL bCreateOK; - Timer aPaintTimer; - Rectangle aPaintRect; - BOOL bDialogModelChanged; + DlgEdFactory* pObjFac; + Window* pWindow; + DlgEdFunc* pFunc; + DlgEdMode eMode; + USHORT eActObj; + BOOL bFirstDraw; + Size aGridSize; + BOOL bGridVisible; + BOOL bGridSnap; + BOOL bCreateOK; + Timer aPaintTimer; + Rectangle aPaintRect; + BOOL bDialogModelChanged; Timer aMarkTimer; - long mnPaintGuard; + long mnPaintGuard; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xDocument; DlgEditor(); // not implemented @@ -137,8 +137,8 @@ public: DlgEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); ~DlgEditor(); - void SetWindow( Window* pWindow ); - Window* GetWindow() const { return pWindow; } + void SetWindow( Window* pWindow ); + Window* GetWindow() const { return pWindow; } /** returns the control container associated with our window @see GetWindow @@ -147,59 +147,59 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > GetWindowControlContainer(); - void SetDlgEdForm( DlgEdForm* pForm ) { pDlgEdForm = pForm; } - DlgEdForm* GetDlgEdForm() const { return pDlgEdForm; } + void SetDlgEdForm( DlgEdForm* pForm ) { pDlgEdForm = pForm; } + DlgEdForm* GetDlgEdForm() const { return pDlgEdForm; } - void SetScrollBars( ScrollBar* pHScroll, ScrollBar* pVScroll ); + void SetScrollBars( ScrollBar* pHScroll, ScrollBar* pVScroll ); void InitScrollBars(); - ScrollBar* GetHScroll() const { return pHScroll; } - ScrollBar* GetVScroll() const { return pVScroll; } - void DoScroll( ScrollBar* pActScroll ); - void UpdateScrollBars(); + ScrollBar* GetHScroll() const { return pHScroll; } + ScrollBar* GetVScroll() const { return pVScroll; } + void DoScroll( ScrollBar* pActScroll ); + void UpdateScrollBars(); - void SetDialog( ::com::sun::star::uno::Reference< + void SetDialog( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xUnoControlDialogModel ); - void ResetDialog( void ); - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > GetDialog() const + void ResetDialog( void ); + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > GetDialog() const {return m_xUnoControlDialogModel;} ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > const & GetNumberFormatsSupplier(); - DlgEdModel* GetModel() const { return pDlgEdModel; } - DlgEdView* GetView() const { return pDlgEdView; } - DlgEdPage* GetPage() const { return pDlgEdPage; } + DlgEdModel* GetModel() const { return pDlgEdModel; } + DlgEdView* GetView() const { return pDlgEdView; } + DlgEdPage* GetPage() const { return pDlgEdPage; } - void ShowDialog(); + void ShowDialog(); - BOOL UnmarkDialog(); - BOOL RemarkDialog(); + BOOL UnmarkDialog(); + BOOL RemarkDialog(); - void SetDialogModelChanged( BOOL bChanged = TRUE ) { bDialogModelChanged = bChanged; } - BOOL IsDialogModelChanged() const { return bDialogModelChanged; } + void SetDialogModelChanged( BOOL bChanged = TRUE ) { bDialogModelChanged = bChanged; } + BOOL IsDialogModelChanged() const { return bDialogModelChanged; } - BOOL IsModified() const; - void ClearModifyFlag(); + BOOL IsModified() const; + void ClearModifyFlag(); - void MouseButtonDown( const MouseEvent& rMEvt ); - void MouseButtonUp( const MouseEvent& rMEvt ); - void MouseMove( const MouseEvent& rMEvt ); - void Paint( const Rectangle& rRect ); - BOOL KeyInput( const KeyEvent& rKEvt ); + void MouseButtonDown( const MouseEvent& rMEvt ); + void MouseButtonUp( const MouseEvent& rMEvt ); + void MouseMove( const MouseEvent& rMEvt ); + void Paint( const Rectangle& rRect ); + BOOL KeyInput( const KeyEvent& rKEvt ); - void SetMode( DlgEdMode eMode ); - void SetInsertObj( USHORT eObj ); - USHORT GetInsertObj() const; - void CreateDefaultObject(); - DlgEdMode GetMode() const { return eMode; } - BOOL IsCreateOK() const { return bCreateOK; } + void SetMode( DlgEdMode eMode ); + void SetInsertObj( USHORT eObj ); + USHORT GetInsertObj() const; + void CreateDefaultObject(); + DlgEdMode GetMode() const { return eMode; } + BOOL IsCreateOK() const { return bCreateOK; } - void Cut(); - void Copy(); - void Paste(); - void Delete(); + void Cut(); + void Copy(); + void Paste(); + void Delete(); BOOL IsPasteAllowed(); - void ShowProperties(); + void ShowProperties(); void UpdatePropertyBrowserDelayed(); sal_Int32 countPages( Printer* pPrinter ); @@ -207,7 +207,7 @@ public: bool AdjustPageSize(); - bool isInPaint() const { return mnPaintGuard > 0; } + bool isInPaint() const { return mnPaintGuard > 0; } }; #endif //_BASCTL_DLGED_HXX diff --git a/basctl/source/inc/dlgedclip.hxx b/basctl/source/inc/dlgedclip.hxx index 605b6ee87e34..24b2f93d4d3b 100644 --- a/basctl/source/inc/dlgedclip.hxx +++ b/basctl/source/inc/dlgedclip.hxx @@ -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 @@ -50,12 +50,12 @@ private: protected: virtual sal_Bool compareDataFlavors( const ::com::sun::star::datatransfer::DataFlavor& lFlavor, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); -public: +public: DlgEdTransferableImpl( const ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor >& aSeqFlavors, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aSeqData ); virtual ~DlgEdTransferableImpl(); - + // XTransferable - virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) throw(::com::sun::star::uno::RuntimeException); diff --git a/basctl/source/inc/dlgeddef.hxx b/basctl/source/inc/dlgeddef.hxx index ae7926b9fb20..c207d363d940 100644 --- a/basctl/source/inc/dlgeddef.hxx +++ b/basctl/source/inc/dlgeddef.hxx @@ -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/basctl/source/inc/dlgedfac.hxx b/basctl/source/inc/dlgedfac.hxx index 0b3debc5dbc2..742d171db58e 100644 --- a/basctl/source/inc/dlgedfac.hxx +++ b/basctl/source/inc/dlgedfac.hxx @@ -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/basctl/source/inc/dlgedfunc.hxx b/basctl/source/inc/dlgedfunc.hxx index 740485c801c8..d5915663b174 100644 --- a/basctl/source/inc/dlgedfunc.hxx +++ b/basctl/source/inc/dlgedfunc.hxx @@ -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 @@ -44,10 +44,10 @@ class DlgEdFunc /* : public LinkHdl */ { protected: DlgEditor* pParent; - Timer aScrollTimer; + Timer aScrollTimer; DECL_LINK( ScrollTimeout, Timer * ); - void ForceScroll( const Point& rPos ); + void ForceScroll( const Point& rPos ); public: DlgEdFunc( DlgEditor* pParent ); @@ -81,7 +81,7 @@ public: class DlgEdFuncSelect : public DlgEdFunc { protected: - BOOL bMarkAction; + BOOL bMarkAction; public: DlgEdFuncSelect( DlgEditor* pParent ); diff --git a/basctl/source/inc/dlgedlist.hxx b/basctl/source/inc/dlgedlist.hxx index 39b9473abba4..ced0cfdc1368 100644 --- a/basctl/source/inc/dlgedlist.hxx +++ b/basctl/source/inc/dlgedlist.hxx @@ -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 @@ -44,7 +44,7 @@ typedef ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListene class DlgEdPropListenerImpl: public PropertyChangeListenerHelper { private: - DlgEdObj* pDlgEdObj; + DlgEdObj* pDlgEdObj; public: DlgEdPropListenerImpl(DlgEdObj* pObj); @@ -67,7 +67,7 @@ typedef ::cppu::WeakImplHelper1< ::com::sun::star::container::XContainerListener class DlgEdEvtContListenerImpl: public ContainerListenerHelper { private: - DlgEdObj* pDlgEdObj; + DlgEdObj* pDlgEdObj; public: DlgEdEvtContListenerImpl(DlgEdObj* pObj); diff --git a/basctl/source/inc/dlgedmod.hxx b/basctl/source/inc/dlgedmod.hxx index f4abcaad49c3..e010e07b0a0e 100644 --- a/basctl/source/inc/dlgedmod.hxx +++ b/basctl/source/inc/dlgedmod.hxx @@ -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/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx index ab8dbf3fa10e..bb85f7a55780 100644 --- a/basctl/source/inc/dlgedobj.hxx +++ b/basctl/source/inc/dlgedobj.hxx @@ -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 @@ -57,14 +57,14 @@ class DlgEdObj: public SdrUnoObj friend class DlgEdForm; private: - sal_Bool bIsListening; - DlgEdForm* pDlgEdForm; + sal_Bool bIsListening; + DlgEdForm* pDlgEdForm; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener> m_xPropertyChangeListener; ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener> m_xContainerListener; protected: DlgEdObj(); - DlgEdObj(const ::rtl::OUString& rModelName, + DlgEdObj(const ::rtl::OUString& rModelName, const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac); virtual void NbcMove( const Size& rSize ); @@ -77,19 +77,19 @@ protected: void StartListening(); using SfxListener::EndListening; void EndListening(sal_Bool bRemoveListener = sal_True); - sal_Bool isListening() const { return bIsListening; } + sal_Bool isListening() const { return bIsListening; } - virtual bool TransformSdrToControlCoordinates( - sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn, + virtual bool TransformSdrToControlCoordinates( + sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn, sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut ); - virtual bool TransformSdrToFormCoordinates( - sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn, + virtual bool TransformSdrToFormCoordinates( + sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn, sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut ); - virtual bool TransformControlToSdrCoordinates( - sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn, + virtual bool TransformControlToSdrCoordinates( + sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn, sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut ); - virtual bool TransformFormToSdrCoordinates( - sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn, + virtual bool TransformFormToSdrCoordinates( + sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn, sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut ); public: @@ -97,26 +97,26 @@ public: virtual ~DlgEdObj(); virtual void SetPage(SdrPage* pNewPage); - + virtual void SetDlgEdForm( DlgEdForm* pForm ) { pDlgEdForm = pForm; } virtual DlgEdForm* GetDlgEdForm() const { return pDlgEdForm; } virtual sal_uInt32 GetObjInventor() const; virtual sal_uInt16 GetObjIdentifier() const; - virtual SdrObject* Clone() const; // not working yet - virtual void operator= (const SdrObject& rObj); // not working yet - virtual void clonedFrom(const DlgEdObj* _pSource); // not working yet + virtual SdrObject* Clone() const; // not working yet + virtual void operator= (const SdrObject& rObj); // not working yet + virtual void clonedFrom(const DlgEdObj* _pSource); // not working yet // FullDrag support virtual SdrObject* getFullDragClone() const; - virtual sal_Bool supportsService( const sal_Char* _pServiceName ) const; - virtual ::rtl::OUString GetDefaultName() const; - virtual ::rtl::OUString GetUniqueName() const; + virtual sal_Bool supportsService( const sal_Char* _pServiceName ) const; + virtual ::rtl::OUString GetDefaultName() const; + virtual ::rtl::OUString GetUniqueName() const; - virtual sal_Int32 GetStep() const; - virtual void UpdateStep(); + virtual sal_Int32 GetStep() const; + virtual void UpdateStep(); virtual void SetDefaults(); virtual void SetRectFromProps(); @@ -154,7 +154,7 @@ private: ::std::vector<DlgEdObj*> pChilds; mutable ::boost::optional< ::com::sun::star::awt::DeviceInfo > mpDeviceInfo; - + protected: DlgEdForm(); @@ -175,7 +175,7 @@ public: virtual void RemoveChild( DlgEdObj* pDlgEdObj ); virtual ::std::vector<DlgEdObj*> GetChilds() const { return pChilds; } - virtual void UpdateStep(); + virtual void UpdateStep(); virtual void SetRectFromProps(); virtual void SetPropsFromRect(); diff --git a/basctl/source/inc/dlgedpage.hxx b/basctl/source/inc/dlgedpage.hxx index ed8682c3339b..ab321ef1b120 100644 --- a/basctl/source/inc/dlgedpage.hxx +++ b/basctl/source/inc/dlgedpage.hxx @@ -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 @@ -41,7 +41,7 @@ class DlgEdForm; class DlgEdPage : public SdrPage { private: - DlgEdForm* pDlgEdForm; + DlgEdForm* pDlgEdForm; public: TYPEINFO(); @@ -53,8 +53,8 @@ public: using SdrPage::Clone; virtual SdrPage* Clone() const; - void SetDlgEdForm( DlgEdForm* pForm ) { pDlgEdForm = pForm; } - DlgEdForm* GetDlgEdForm() const { return pDlgEdForm; } + void SetDlgEdForm( DlgEdForm* pForm ) { pDlgEdForm = pForm; } + DlgEdForm* GetDlgEdForm() const { return pDlgEdForm; } virtual SdrObject* SetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum); }; diff --git a/basctl/source/inc/dlgedview.hxx b/basctl/source/inc/dlgedview.hxx index 08da25932227..5fedf6d4be05 100644 --- a/basctl/source/inc/dlgedview.hxx +++ b/basctl/source/inc/dlgedview.hxx @@ -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/basctl/source/inc/dlgresid.hrc b/basctl/source/inc/dlgresid.hrc index 3499cd5ed7c6..64e9893c9d58 100644 --- a/basctl/source/inc/dlgresid.hrc +++ b/basctl/source/inc/dlgresid.hrc @@ -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 @@ -28,48 +28,48 @@ #ifndef _BASCTL_DLGRESID_HRC #define _BASCTL_DLGRESID_HRC -// include ----------------------------------------------------------- +// include ----------------------------------------------------------- #include <svl/solar.hrc> // Dialog Control Id's ----------------------------------------------------------- -#define RID_STR_CLASS_CONTROL ( RID_DLG_START + 0 ) -#define RID_STR_CLASS_DIALOG ( RID_DLG_START + 1 ) -#define RID_STR_CLASS_BUTTON ( RID_DLG_START + 2 ) -#define RID_STR_CLASS_RADIOBUTTON ( RID_DLG_START + 3 ) -#define RID_STR_CLASS_CHECKBOX ( RID_DLG_START + 4 ) -#define RID_STR_CLASS_LISTBOX ( RID_DLG_START + 5 ) -#define RID_STR_CLASS_COMBOBOX ( RID_DLG_START + 6 ) -#define RID_STR_CLASS_GROUPBOX ( RID_DLG_START + 7 ) -#define RID_STR_CLASS_EDIT ( RID_DLG_START + 8 ) -#define RID_STR_CLASS_FIXEDTEXT ( RID_DLG_START + 9 ) -#define RID_STR_CLASS_IMAGECONTROL ( RID_DLG_START + 10 ) -#define RID_STR_CLASS_PROGRESSBAR ( RID_DLG_START + 11 ) -#define RID_STR_CLASS_SCROLLBAR ( RID_DLG_START + 12 ) -#define RID_STR_CLASS_FIXEDLINE ( RID_DLG_START + 13 ) -#define RID_STR_CLASS_DATEFIELD ( RID_DLG_START + 14 ) -#define RID_STR_CLASS_TIMEFIELD ( RID_DLG_START + 15 ) -#define RID_STR_CLASS_NUMERICFIELD ( RID_DLG_START + 16 ) -#define RID_STR_CLASS_CURRENCYFIELD ( RID_DLG_START + 17 ) -#define RID_STR_CLASS_FORMATTEDFIELD ( RID_DLG_START + 18 ) -#define RID_STR_CLASS_PATTERNFIELD ( RID_DLG_START + 19 ) -#define RID_STR_CLASS_FILECONTROL ( RID_DLG_START + 20 ) -#define RID_STR_TRANSLATION_NOTLOCALIZED ( RID_DLG_START + 21 ) -#define RID_STR_TRANSLATION_DEFAULT ( RID_DLG_START + 22 ) -#define RID_STR_CLASS_TREECONTROL ( RID_DLG_START + 23 ) +#define RID_STR_CLASS_CONTROL ( RID_DLG_START + 0 ) +#define RID_STR_CLASS_DIALOG ( RID_DLG_START + 1 ) +#define RID_STR_CLASS_BUTTON ( RID_DLG_START + 2 ) +#define RID_STR_CLASS_RADIOBUTTON ( RID_DLG_START + 3 ) +#define RID_STR_CLASS_CHECKBOX ( RID_DLG_START + 4 ) +#define RID_STR_CLASS_LISTBOX ( RID_DLG_START + 5 ) +#define RID_STR_CLASS_COMBOBOX ( RID_DLG_START + 6 ) +#define RID_STR_CLASS_GROUPBOX ( RID_DLG_START + 7 ) +#define RID_STR_CLASS_EDIT ( RID_DLG_START + 8 ) +#define RID_STR_CLASS_FIXEDTEXT ( RID_DLG_START + 9 ) +#define RID_STR_CLASS_IMAGECONTROL ( RID_DLG_START + 10 ) +#define RID_STR_CLASS_PROGRESSBAR ( RID_DLG_START + 11 ) +#define RID_STR_CLASS_SCROLLBAR ( RID_DLG_START + 12 ) +#define RID_STR_CLASS_FIXEDLINE ( RID_DLG_START + 13 ) +#define RID_STR_CLASS_DATEFIELD ( RID_DLG_START + 14 ) +#define RID_STR_CLASS_TIMEFIELD ( RID_DLG_START + 15 ) +#define RID_STR_CLASS_NUMERICFIELD ( RID_DLG_START + 16 ) +#define RID_STR_CLASS_CURRENCYFIELD ( RID_DLG_START + 17 ) +#define RID_STR_CLASS_FORMATTEDFIELD ( RID_DLG_START + 18 ) +#define RID_STR_CLASS_PATTERNFIELD ( RID_DLG_START + 19 ) +#define RID_STR_CLASS_FILECONTROL ( RID_DLG_START + 20 ) +#define RID_STR_TRANSLATION_NOTLOCALIZED ( RID_DLG_START + 21 ) +#define RID_STR_TRANSLATION_DEFAULT ( RID_DLG_START + 22 ) +#define RID_STR_CLASS_TREECONTROL ( RID_DLG_START + 23 ) // Property Browser Headline Id's ----------------------------------------------------------- -#define RID_STR_BRWTITLE_PROPERTIES ( RID_DLG_START + 60 ) -#define RID_STR_BRWTITLE_NO_PROPERTIES ( RID_DLG_START + 61 ) -#define RID_STR_BRWTITLE_MULTISELECT ( RID_DLG_START + 62 ) +#define RID_STR_BRWTITLE_PROPERTIES ( RID_DLG_START + 60 ) +#define RID_STR_BRWTITLE_NO_PROPERTIES ( RID_DLG_START + 61 ) +#define RID_STR_BRWTITLE_MULTISELECT ( RID_DLG_START + 62 ) // Manage Language Dialogs -#define RID_DLG_MANAGE_LANGUAGE ( RID_DLG_START + 70 ) -#define RID_QRYBOX_LANGUAGE ( RID_DLG_START + 71 ) -#define RID_DLG_SETDEF_LANGUAGE ( RID_DLG_START + 72 ) -#define RID_DLG_ADD_LANGUAGE ( RID_DLG_START + 73 ) +#define RID_DLG_MANAGE_LANGUAGE ( RID_DLG_START + 70 ) +#define RID_QRYBOX_LANGUAGE ( RID_DLG_START + 71 ) +#define RID_DLG_SETDEF_LANGUAGE ( RID_DLG_START + 72 ) +#define RID_DLG_ADD_LANGUAGE ( RID_DLG_START + 73 ) // ----------------------------------------------------------------------- diff --git a/basctl/source/inc/doceventnotifier.hxx b/basctl/source/inc/doceventnotifier.hxx index bad9f29c515b..b991a12245ce 100644 --- a/basctl/source/inc/doceventnotifier.hxx +++ b/basctl/source/inc/doceventnotifier.hxx @@ -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/basctl/source/inc/docsignature.hxx b/basctl/source/inc/docsignature.hxx index 941b76026041..3b8d01c169c4 100644 --- a/basctl/source/inc/docsignature.hxx +++ b/basctl/source/inc/docsignature.hxx @@ -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/basctl/source/inc/iderid.hxx b/basctl/source/inc/iderid.hxx index f8560ad45d00..03324e9f2624 100644 --- a/basctl/source/inc/iderid.hxx +++ b/basctl/source/inc/iderid.hxx @@ -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/basctl/source/inc/localizationmgr.hxx b/basctl/source/inc/localizationmgr.hxx index 7a61eeb132dc..e3e3f3e7196b 100644 --- a/basctl/source/inc/localizationmgr.hxx +++ b/basctl/source/inc/localizationmgr.hxx @@ -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,14 +40,14 @@ class DlgEditor; class LocalizationMgr { ::com::sun::star::uno::Reference - < ::com::sun::star::resource::XStringResourceManager > m_xStringResourceManager; + < ::com::sun::star::resource::XStringResourceManager > m_xStringResourceManager; - BasicIDEShell* m_pIDEShell; + BasicIDEShell* m_pIDEShell; ScriptDocument m_aDocument; - String m_aLibName; + String m_aLibName; - ::com::sun::star::lang::Locale m_aLocaleBeforeBasicStart; + ::com::sun::star::lang::Locale m_aLocaleBeforeBasicStart; enum HandleResourceMode { @@ -141,7 +141,7 @@ public: static void copyResourceForDroppedDialog( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xDialogModel, - const ::rtl::OUString& aDialogName, + const ::rtl::OUString& aDialogName, ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager > xStringResourceManager, ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceResolver > xSourceStringResolver ); diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx index ef030b4bcdf1..a10a5600840a 100644 --- a/basctl/source/inc/managelang.hxx +++ b/basctl/source/inc/managelang.hxx @@ -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,9 +40,9 @@ class LocalizationMgr; struct LanguageEntry { - String m_sLanguage; - ::com::sun::star::lang::Locale m_aLocale; - bool m_bIsDefault; + String m_sLanguage; + ::com::sun::star::lang::Locale m_aLocale; + bool m_bIsDefault; LanguageEntry( const String& _rLanguage, const ::com::sun::star::lang::Locale& _rLocale, @@ -58,32 +58,32 @@ extern bool localesAreEqual( const ::com::sun::star::lang::Locale& rLocaleLeft, class ManageLanguageDialog : public ModalDialog { private: - FixedText m_aLanguageFT; - ListBox m_aLanguageLB; - PushButton m_aAddPB; - PushButton m_aDeletePB; - PushButton m_aMakeDefPB; - FixedText m_aInfoFT; + FixedText m_aLanguageFT; + ListBox m_aLanguageLB; + PushButton m_aAddPB; + PushButton m_aDeletePB; + PushButton m_aMakeDefPB; + FixedText m_aInfoFT; - FixedLine m_aBtnLine; - HelpButton m_aHelpBtn; - OKButton m_aCloseBtn; + FixedLine m_aBtnLine; + HelpButton m_aHelpBtn; + OKButton m_aCloseBtn; LocalizationMgr* m_pLocalizationMgr; - String m_sDefLangStr; - String m_sDeleteStr; - String m_sCreateLangStr; + String m_sDefLangStr; + String m_sDeleteStr; + String m_sCreateLangStr; - void Init(); + void Init(); void CalcInfoSize(); - void FillLanguageBox(); - void ClearLanguageBox(); + void FillLanguageBox(); + void ClearLanguageBox(); - DECL_LINK( AddHdl, Button * ); - DECL_LINK( DeleteHdl, Button * ); - DECL_LINK( MakeDefHdl, Button * ); - DECL_LINK( SelectHdl, ListBox * ); + DECL_LINK( AddHdl, Button * ); + DECL_LINK( DeleteHdl, Button * ); + DECL_LINK( MakeDefHdl, Button * ); + DECL_LINK( SelectHdl, ListBox * ); public: ManageLanguageDialog( Window* pParent, LocalizationMgr* _pLMgr ); @@ -98,22 +98,22 @@ private: SvxCheckListBox* m_pCheckLangLB; FixedText m_aInfoFT; - FixedLine m_aBtnLine; + FixedLine m_aBtnLine; OKButton m_aOKBtn; - CancelButton m_aCancelBtn; + CancelButton m_aCancelBtn; HelpButton m_aHelpBtn; - bool m_bIsDefaultMode; + bool m_bIsDefaultMode; LocalizationMgr* m_pLocalizationMgr; - void FillLanguageBox(); + void FillLanguageBox(); void CalcInfoSize(); public: SetDefaultLanguageDialog( Window* pParent, LocalizationMgr* _pLMgr ); ~SetDefaultLanguageDialog(); - ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > GetLocales() const; + ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > GetLocales() const; }; #endif //_BASCTL_MANAGELANG_HXX diff --git a/basctl/source/inc/propbrw.hxx b/basctl/source/inc/propbrw.hxx index 9e0e1e334b0f..9d869abe0c3c 100644 --- a/basctl/source/inc/propbrw.hxx +++ b/basctl/source/inc/propbrw.hxx @@ -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 @@ -61,7 +61,7 @@ class SdrView; class PropBrw : public SfxFloatingWindow , public SfxListener, public SfxBroadcaster { private: - sal_Bool m_bInitialStateChange; + sal_Bool m_bInitialStateChange; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; @@ -75,7 +75,7 @@ private: m_xContextDocument; protected: - SdrView* pView; + SdrView* pView; virtual void Resize(); virtual void FillInfo( SfxChildWinInfo& rInfo ) const; virtual sal_Bool Close(); @@ -105,7 +105,7 @@ public: // note: changing the Context document to an instance other than the one given in the ctor is not supported // currently void Update( const SfxViewShell* _pShell ); - SdrView* GetCurView() const { return pView; } + SdrView* GetCurView() const { return pView; } private: void ImplUpdate( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxContextDocument, SdrView* pView ); diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx index a3b0c907caf8..2578e1d2ce7f 100644 --- a/basctl/source/inc/sbxitem.hxx +++ b/basctl/source/inc/sbxitem.hxx @@ -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 @@ -31,21 +31,21 @@ #include "scriptdocument.hxx" #include <svl/poolitem.hxx> -const USHORT BASICIDE_TYPE_UNKNOWN = 0; -const USHORT BASICIDE_TYPE_SHELL = 1; -const USHORT BASICIDE_TYPE_LIBRARY = 2; -const USHORT BASICIDE_TYPE_MODULE = 3; -const USHORT BASICIDE_TYPE_DIALOG = 4; -const USHORT BASICIDE_TYPE_METHOD = 5; +const USHORT BASICIDE_TYPE_UNKNOWN = 0; +const USHORT BASICIDE_TYPE_SHELL = 1; +const USHORT BASICIDE_TYPE_LIBRARY = 2; +const USHORT BASICIDE_TYPE_MODULE = 3; +const USHORT BASICIDE_TYPE_DIALOG = 4; +const USHORT BASICIDE_TYPE_METHOD = 5; class SbxItem : public SfxPoolItem { ScriptDocument m_aDocument; - String m_aLibName; - String m_aName; - String m_aMethodName; - USHORT m_nType; + String m_aLibName; + String m_aName; + String m_aMethodName; + USHORT m_nType; public: TYPEINFO(); @@ -53,24 +53,24 @@ public: SbxItem( USHORT nWhich, const ScriptDocument& rDocument, const String& aLibName, const String& aName, const String& aMethodName, USHORT nType ); SbxItem( const SbxItem& ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const; const ScriptDocument& GetDocument() const { return m_aDocument; } - void SetDocument( const ScriptDocument& rDocument ) { m_aDocument = rDocument; } + void SetDocument( const ScriptDocument& rDocument ) { m_aDocument = rDocument; } - const String& GetLibName() const { return m_aLibName; } - void SetLibName( const String& aLibName ) { m_aLibName = aLibName; } + const String& GetLibName() const { return m_aLibName; } + void SetLibName( const String& aLibName ) { m_aLibName = aLibName; } - const String& GetName() const { return m_aName; } - void SetName( const String& aName ) { m_aName = aName; } + const String& GetName() const { return m_aName; } + void SetName( const String& aName ) { m_aName = aName; } - const String& GetMethodName() const { return m_aMethodName; } - void SetMethodName( const String& aMethodName ) { m_aMethodName = aMethodName; } + const String& GetMethodName() const { return m_aMethodName; } + void SetMethodName( const String& aMethodName ) { m_aMethodName = aMethodName; } - USHORT GetType() const { return m_nType; } - void SetType( USHORT nType ) { m_nType = nType; } + USHORT GetType() const { return m_nType; } + void SetType( USHORT nType ) { m_nType = nType; } }; diff --git a/basctl/source/inc/scriptdocument.hxx b/basctl/source/inc/scriptdocument.hxx index 5791971a57d8..f5ea8a0602e1 100644 --- a/basctl/source/inc/scriptdocument.hxx +++ b/basctl/source/inc/scriptdocument.hxx @@ -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/basctl/source/inc/svheader.hxx b/basctl/source/inc/svheader.hxx index 152495d9ee8d..6cd1ebf66d88 100644 --- a/basctl/source/inc/svheader.hxx +++ b/basctl/source/inc/svheader.hxx @@ -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 |