diff options
Diffstat (limited to 'sd/source/ui/dlg')
80 files changed, 901 insertions, 901 deletions
diff --git a/sd/source/ui/dlg/AnimationChildWindow.cxx b/sd/source/ui/dlg/AnimationChildWindow.cxx index fa62b21948a8..807a4fc4f386 100644 --- a/sd/source/ui/dlg/AnimationChildWindow.cxx +++ b/sd/source/ui/dlg/AnimationChildWindow.cxx @@ -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 @@ -51,7 +51,7 @@ AnimationChildWindow::AnimationChildWindow( ::Window* _pParent, USHORT nId, SfxBindings* pBindings, - SfxChildWinInfo* pInfo ) + SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ) { AnimationWindow* pAnimWin = new AnimationWindow( diff --git a/sd/source/ui/dlg/LayerDialog.src b/sd/source/ui/dlg/LayerDialog.src index 9d620d8e595f..2bf8e8b9fe18 100644 --- a/sd/source/ui/dlg/LayerDialog.src +++ b/sd/source/ui/dlg/LayerDialog.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/sd/source/ui/dlg/LayerDialogChildWindow.cxx b/sd/source/ui/dlg/LayerDialogChildWindow.cxx index 8725cfc594fd..f49a6c2a60a4 100644 --- a/sd/source/ui/dlg/LayerDialogChildWindow.cxx +++ b/sd/source/ui/dlg/LayerDialogChildWindow.cxx @@ -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 @@ -55,15 +55,15 @@ LayerDialogChildWindow::LayerDialogChildWindow ( ::Window* _pParent, USHORT nId, SfxBindings* pBindings, - SfxChildWinInfo* pInfo) + SfxChildWinInfo* pInfo) : SfxChildWindow (_pParent, nId) { ViewShellBase& rBase (*ViewShellBase::GetViewShellBase( pBindings->GetDispatcher()->GetFrame())); LayerDialogContent* pContent = new LayerDialogContent ( - pBindings, - this, - _pParent, + pBindings, + this, + _pParent, SdResId( FLT_WIN_LAYER_DIALOG), rBase); pWindow = pContent; diff --git a/sd/source/ui/dlg/LayerDialogContent.cxx b/sd/source/ui/dlg/LayerDialogContent.cxx index 975d277c7dff..74c5660d8fe7 100755 --- a/sd/source/ui/dlg/LayerDialogContent.cxx +++ b/sd/source/ui/dlg/LayerDialogContent.cxx @@ -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/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx index 29425a3bda71..7a0d8e2f525f 100644 --- a/sd/source/ui/dlg/LayerTabBar.cxx +++ b/sd/source/ui/dlg/LayerTabBar.cxx @@ -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 @@ -63,7 +63,7 @@ namespace sd { |* \************************************************************************/ -LayerTabBar::LayerTabBar(DrawViewShell* pViewSh, Window* pParent) +LayerTabBar::LayerTabBar(DrawViewShell* pViewSh, Window* pParent) : TabBar( pParent, WinBits( WB_BORDER | WB_3DLOOK | WB_SCROLL | WB_SIZEABLE ) ), DropTargetHelper( this ), pDrViewSh(pViewSh) @@ -76,9 +76,9 @@ LayerTabBar::LayerTabBar(DrawViewShell* pViewSh, Window* pParent) LayerTabBar::LayerTabBar ( - DrawViewShell* pViewSh, - Window* pParent, - const ResId& rResId) + DrawViewShell* pViewSh, + Window* pParent, + const ResId& rResId) : TabBar (pParent, rResId.GetWinBits()), DropTargetHelper( this ), pDrViewSh(pViewSh) @@ -167,14 +167,14 @@ sal_Int8 LayerTabBar::AcceptDrop( const AcceptDropEvent& rEvt ) { sal_Int8 nRet = DND_ACTION_NONE; - if( rEvt.mbLeaving ) + if( rEvt.mbLeaving ) EndSwitchPage(); if( !pDrViewSh->GetDocSh()->IsReadOnly() ) { - USHORT nPageId = SDRPAGE_NOTFOUND; - Point aPos( PixelToLogic( rEvt.maPosPixel ) ); - USHORT nLayerId = pDrViewSh->GetView()->GetDoc()->GetLayerAdmin().GetLayerID( GetPageText( GetPageId( aPos ) ), FALSE ); + USHORT nPageId = SDRPAGE_NOTFOUND; + Point aPos( PixelToLogic( rEvt.maPosPixel ) ); + USHORT nLayerId = pDrViewSh->GetView()->GetDoc()->GetLayerAdmin().GetLayerID( GetPageText( GetPageId( aPos ) ), FALSE ); nRet = pDrViewSh->AcceptDrop( rEvt, *this, NULL, nPageId, nLayerId ); @@ -192,9 +192,9 @@ sal_Int8 LayerTabBar::AcceptDrop( const AcceptDropEvent& rEvt ) sal_Int8 LayerTabBar::ExecuteDrop( const ExecuteDropEvent& rEvt ) { - USHORT nPageId = SDRPAGE_NOTFOUND; - USHORT nLayerId = pDrViewSh->GetView()->GetDoc()->GetLayerAdmin().GetLayerID( GetPageText( GetPageId( PixelToLogic( rEvt.maPosPixel ) ) ), FALSE ); - sal_Int8 nRet = pDrViewSh->ExecuteDrop( rEvt, *this, NULL, nPageId, nLayerId ); + USHORT nPageId = SDRPAGE_NOTFOUND; + USHORT nLayerId = pDrViewSh->GetView()->GetDoc()->GetLayerAdmin().GetLayerID( GetPageText( GetPageId( PixelToLogic( rEvt.maPosPixel ) ) ), FALSE ); + sal_Int8 nRet = pDrViewSh->ExecuteDrop( rEvt, *this, NULL, nPageId, nLayerId ); EndSwitchPage(); @@ -356,7 +356,7 @@ void LayerTabBar::ActivatePage() { if ( /*IsInSwitching*/ 1 && pDrViewSh!=NULL) { - + SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher(); pDispatcher->Execute(SID_SWITCHLAYER, SFX_CALLMODE_ASYNCHRON); } diff --git a/sd/source/ui/dlg/NavigatorChildWindow.cxx b/sd/source/ui/dlg/NavigatorChildWindow.cxx index a17a4064bf6e..f09bb38befd4 100644 --- a/sd/source/ui/dlg/NavigatorChildWindow.cxx +++ b/sd/source/ui/dlg/NavigatorChildWindow.cxx @@ -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 @@ -42,7 +42,7 @@ NavigatorChildWindow::NavigatorChildWindow ( ::Window* pParent, USHORT nId, SfxBindings* pBindings, - SfxChildWinInfo* ) + SfxChildWinInfo* ) : SfxChildWindowContext( nId ) { SdNavigatorWin* pNavWin = new SdNavigatorWin( pParent, this, diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx index 181fc8433c22..83c8178ce8ae 100755 --- a/sd/source/ui/dlg/PaneChildWindows.cxx +++ b/sd/source/ui/dlg/PaneChildWindows.cxx @@ -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 @@ -56,17 +56,17 @@ SFX_IMPL_DOCKINGWINDOW( ToolPanelChildWindow, SID_TASKPANE) PaneChildWindow::PaneChildWindow ( ::Window* pParentWindow, - USHORT nId, - SfxBindings* pBindings, + USHORT nId, + SfxBindings* pBindings, SfxChildWinInfo* pInfo, const USHORT nDockWinTitleResId, const USHORT nTitleBarResId, - SfxChildAlignment eAlignment) + SfxChildAlignment eAlignment) : SfxChildWindow (pParentWindow, nId) { pWindow = new PaneDockingWindow ( - pBindings, - this, + pBindings, + this, pParentWindow, SdResId( nDockWinTitleResId ), String( SdResId( nTitleBarResId ) ) ); @@ -104,9 +104,9 @@ PaneChildWindow::~PaneChildWindow (void) LeftPaneImpressChildWindow::LeftPaneImpressChildWindow ( ::Window* pParentWindow, - USHORT nId, - SfxBindings* pBindings, - SfxChildWinInfo* pInfo) + USHORT nId, + SfxBindings* pBindings, + SfxChildWinInfo* pInfo) : PaneChildWindow( pParentWindow, nId, @@ -125,9 +125,9 @@ LeftPaneImpressChildWindow::LeftPaneImpressChildWindow ( LeftPaneDrawChildWindow::LeftPaneDrawChildWindow ( ::Window* pParentWindow, - USHORT nId, - SfxBindings* pBindings, - SfxChildWinInfo* pInfo) + USHORT nId, + SfxBindings* pBindings, + SfxChildWinInfo* pInfo) : PaneChildWindow( pParentWindow, nId, @@ -146,7 +146,7 @@ LeftPaneDrawChildWindow::LeftPaneDrawChildWindow ( //= ToolPanelChildWindow //====================================================================================================================== //---------------------------------------------------------------------------------------------------------------------- -ToolPanelChildWindow::ToolPanelChildWindow( ::Window* i_pParentWindow, USHORT i_nId, SfxBindings* i_pBindings, +ToolPanelChildWindow::ToolPanelChildWindow( ::Window* i_pParentWindow, USHORT i_nId, SfxBindings* i_pBindings, SfxChildWinInfo* i_pChildWindowInfo ) :PaneChildWindow( i_pParentWindow, i_nId, i_pBindings, i_pChildWindowInfo, FLT_TOOL_PANEL_DOCKING_WINDOW, STR_RIGHT_PANE_TITLE, SFX_ALIGN_RIGHT ) diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index c1dedd5d8293..e859b7ed72cb 100755 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -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/sd/source/ui/dlg/PaneDockingWindow.src b/sd/source/ui/dlg/PaneDockingWindow.src index 23b0d19ac79b..0b366e142bd5 100755 --- a/sd/source/ui/dlg/PaneDockingWindow.src +++ b/sd/source/ui/dlg/PaneDockingWindow.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 @@ DockingWindow FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW { - // HelpID = SID_EFFECT_WIN ; + // HelpID = SID_EFFECT_WIN ; Border = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -45,7 +45,7 @@ DockingWindow FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW DockingWindow FLT_LEFT_PANE_DRAW_DOCKING_WINDOW { - // HelpID = SID_EFFECT_WIN ; + // HelpID = SID_EFFECT_WIN ; Border = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -61,7 +61,7 @@ DockingWindow FLT_LEFT_PANE_DRAW_DOCKING_WINDOW DockingWindow FLT_TOOL_PANEL_DOCKING_WINDOW { - // HelpID = SID_EFFECT_WIN ; + // HelpID = SID_EFFECT_WIN ; Border = TRUE ; Hide = TRUE ; SVLook = TRUE ; diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx index bb1023482ea0..3b3589d66a7b 100755 --- a/sd/source/ui/dlg/PaneShells.cxx +++ b/sd/source/ui/dlg/PaneShells.cxx @@ -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/sd/source/ui/dlg/SpellDialogChildWindow.cxx b/sd/source/ui/dlg/SpellDialogChildWindow.cxx index 7aee12f23bbd..0720283e114f 100755 --- a/sd/source/ui/dlg/SpellDialogChildWindow.cxx +++ b/sd/source/ui/dlg/SpellDialogChildWindow.cxx @@ -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 @@ -35,9 +35,9 @@ #include <sfx2/dispatch.hxx> namespace sd{ - + SFX_IMPL_CHILDWINDOW(SpellDialogChildWindow, SID_SPELL_DIALOG) -} +} #include "ViewShell.hxx" #include "ViewShellBase.hxx" @@ -50,9 +50,9 @@ SFX_IMPL_CHILDWINDOW(SpellDialogChildWindow, SID_SPELL_DIALOG) namespace sd { SpellDialogChildWindow::SpellDialogChildWindow ( - ::Window* _pParent, + ::Window* _pParent, USHORT nId, - SfxBindings* pBindings, + SfxBindings* pBindings, SfxChildWinInfo* pInfo) : ::svx::SpellDialogChildWindow (_pParent, nId, pBindings, pInfo), mpSdOutliner (NULL), diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx index 9f510f20c55d..5ba718381859 100644 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx @@ -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 @@ -50,7 +50,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -namespace { +namespace { const ::rtl::OUString TITLE = ::rtl::OUString::createFromAscii ("Title"); const ::rtl::OUString TARGET_DIR_URL = ::rtl::OUString::createFromAscii ("TargetDirURL"); @@ -59,7 +59,7 @@ const ::rtl::OUString TARGET_URL = ::rtl::OUString::createFromAscii ("Targ const ::rtl::OUString DOCTEMPLATES = ::rtl::OUString::createFromAscii ("com.sun.star.frame.DocumentTemplates"); -// These strings are used to find impress templates in the tree of +// These strings are used to find impress templates in the tree of // template files. Should probably be determined dynamically. const ::rtl::OUString IMPRESS_BIN_TEMPLATE = ::rtl::OUString::createFromAscii ("application/vnd.stardivision.impress"); const ::rtl::OUString IMPRESS_XML_TEMPLATE = MIMETYPE_VND_SUN_XML_IMPRESS; @@ -127,7 +127,7 @@ int Classify (const ::rtl::OUString&, const ::rtl::OUString& rsURL) // highest priority. nPriority = 10; } - + return nPriority; } @@ -136,7 +136,7 @@ int Classify (const ::rtl::OUString&, const ::rtl::OUString& rsURL) -namespace sd +namespace sd { class TemplateScanner::FolderDescriptorList @@ -166,7 +166,7 @@ TemplateScanner::TemplateScanner (void) TemplateScanner::~TemplateScanner (void) { mpFolderDescriptors.reset(); - + // Delete all entries of the template list that have not been // transferred to another object. std::vector<TemplateDir*>::iterator I; @@ -181,7 +181,7 @@ TemplateScanner::~TemplateScanner (void) TemplateScanner::State TemplateScanner::GetTemplateRoot (void) { State eNextState (INITIALIZE_FOLDER_SCANNING); - + Reference<lang::XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory (); DBG_ASSERT (xFactory.is(), "TemplateScanner::GetTemplateRoot: xFactory is NULL"); @@ -227,7 +227,7 @@ TemplateScanner::State TemplateScanner::InitializeEntryScanning (void) } else eNextState = ERROR; - + return eNextState; } @@ -258,7 +258,7 @@ TemplateScanner::State TemplateScanner::ScanEntry (void) // first if necessary). if ( (sContentType == MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE) || (sContentType == IMPRESS_XML_TEMPLATE_OASIS) - || (sContentType == IMPRESS_BIN_TEMPLATE) + || (sContentType == IMPRESS_BIN_TEMPLATE) || (sContentType == IMPRESS_XML_TEMPLATE) || (sContentType == IMPRESS_XML_TEMPLATE_B)) { @@ -287,7 +287,7 @@ TemplateScanner::State TemplateScanner::ScanEntry (void) eNextState = SCAN_FOLDER; } } - + return eNextState; } @@ -310,7 +310,7 @@ TemplateScanner::State TemplateScanner::InitializeFolderScanning (void) Sequence<rtl::OUString> aProps (2); aProps[0] = TITLE; aProps[1] = TARGET_DIR_URL; - + // Create an cursor to iterate over the template folders. ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_ONLY; mxFolderResultSet = Reference<sdbc::XResultSet>( @@ -332,7 +332,7 @@ TemplateScanner::State TemplateScanner::InitializeFolderScanning (void) TemplateScanner::State TemplateScanner::GatherFolderList (void) { State eNextState (ERROR); - + Reference<com::sun::star::ucb::XContentAccess> xContentAccess (mxFolderResultSet, UNO_QUERY); if (xContentAccess.is() && mxFolderResultSet.is()) { @@ -357,7 +357,7 @@ TemplateScanner::State TemplateScanner::GatherFolderList (void) eNextState = SCAN_FOLDER; } - + return eNextState; } @@ -376,7 +376,7 @@ TemplateScanner::State TemplateScanner::ScanFolder (void) ::rtl::OUString sTitle (aDescriptor.msTitle); ::rtl::OUString sTargetDir (aDescriptor.msTargetDir); ::rtl::OUString aId (aDescriptor.msContentIdentifier); - + maFolderContent = ::ucbhelper::Content (aId, aDescriptor.mxFolderEnvironment); if (maFolderContent.isFolder()) { @@ -394,7 +394,7 @@ TemplateScanner::State TemplateScanner::ScanFolder (void) { eNextState = DONE; } - + return eNextState; } @@ -441,7 +441,7 @@ void TemplateScanner::RunNextStep (void) case INITIALIZE_ENTRY_SCAN: meState = InitializeEntryScanning(); break; - + case SCAN_ENTRY: meState = ScanEntry(); break; diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index e179a0ba9f86..ed9706aad493 100755 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -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 @@ -30,7 +30,7 @@ #include <com/sun/star/presentation/AnimationEffect.hpp> #include <com/sun/star/presentation/AnimationSpeed.hpp> -#define _ANIMATION //animation freischalten +#define _ANIMATION //animation freischalten #define _SV_BITMAPEX #include <svx/xoutbmp.hxx> @@ -55,7 +55,7 @@ #include "res_bmp.hrc" #include "ViewShell.hxx" -#ifndef _SV_SVAPP_HXX_ +#ifndef _SV_SVAPP_HXX_ #include <vcl/svapp.hxx> #endif @@ -67,7 +67,7 @@ using namespace ::com::sun::star; namespace sd { /************************************************************************* -|* SdDisplay - Control +|* SdDisplay - Control \************************************************************************/ SdDisplay::SdDisplay( Window* pWin, SdResId Id ) : @@ -135,14 +135,14 @@ void SdDisplay::DataChanged( const DataChangedEvent& rDCEvt ) { const StyleSettings& rStyles = Application::GetSettings().GetStyleSettings(); SetBackground( Wallpaper( Color( rStyles.GetFieldColor() ) ) ); - SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode() - ? ViewShell::OUTPUT_DRAWMODE_CONTRAST + SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode() + ? ViewShell::OUTPUT_DRAWMODE_CONTRAST : ViewShell::OUTPUT_DRAWMODE_COLOR ); } } /************************************************************************* -|* AnimationWindow - FloatingWindow +|* AnimationWindow - FloatingWindow \************************************************************************/ AnimationWindow::AnimationWindow( SfxBindings* pInBindings, @@ -173,13 +173,13 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings, aBtnCreateGroup ( this, SdResId( BTN_CREATE_GROUP ) ), aGrpAnimation ( this, SdResId( GRP_ANIMATION_GROUP ) ), - pWin ( pParent ), - pBitmapEx ( NULL ), + pWin ( pParent ), + pBitmapEx ( NULL ), - bMovie ( FALSE ), - bAllObjects ( FALSE ), + bMovie ( FALSE ), + bAllObjects ( FALSE ), - pBindings ( pInBindings ) + pBindings ( pInBindings ) { FreeResource(); @@ -233,7 +233,7 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings, AnimationWindow::~AnimationWindow() { ULONG i, nCount; - + delete pControllerItem; // Bitmapliste bereinigen @@ -431,7 +431,7 @@ IMPL_LINK( AnimationWindow, ClickGetObjectHdl, void *, pBtn ) // Code jetzt in AddObj() SfxBoolItem aItem( SID_ANIMATOR_ADD, TRUE ); - GetBindings().GetDispatcher()->Execute( + GetBindings().GetDispatcher()->Execute( SID_ANIMATOR_ADD, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L ); return( 0L ); } @@ -440,7 +440,7 @@ IMPL_LINK( AnimationWindow, ClickGetObjectHdl, void *, pBtn ) IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn ) { - SdPage* pPage = pMyDoc->GetSdPage(0, PK_STANDARD); + SdPage* pPage = pMyDoc->GetSdPage(0, PK_STANDARD); SdrObject* pObject; if( pBtn == &aBtnRemoveBitmap ) @@ -535,7 +535,7 @@ IMPL_LINK( AnimationWindow, ClickCreateGroupHdl, void *, EMPTYARG ) // Code jetzt in CreatePresObj() SfxBoolItem aItem( SID_ANIMATOR_CREATE, TRUE ); - GetBindings().GetDispatcher()->Execute( + GetBindings().GetDispatcher()->Execute( SID_ANIMATOR_CREATE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L ); return( 0L ); } @@ -587,11 +587,11 @@ void AnimationWindow::UpdateControl( ULONG nListPos, BOOL bDisableCtrls ) SdrObject* pObject = (SdrObject*) pPage->GetObj( (ULONG) nListPos ); if( pObject ) { - VirtualDevice aVD; - Rectangle aObjRect( pObject->GetCurrentBoundRect() ); - Size aObjSize( aObjRect.GetSize() ); - Point aOrigin( Point( -aObjRect.Left(), -aObjRect.Top() ) ); - MapMode aMap( aVD.GetMapMode() ); + VirtualDevice aVD; + Rectangle aObjRect( pObject->GetCurrentBoundRect() ); + Size aObjSize( aObjRect.GetSize() ); + Point aOrigin( Point( -aObjRect.Left(), -aObjRect.Top() ) ); + MapMode aMap( aVD.GetMapMode() ); aMap.SetMapUnit( MAP_100TH_MM ); aMap.SetOrigin( aOrigin ); aVD.SetMapMode( aMap ); @@ -599,7 +599,7 @@ void AnimationWindow::UpdateControl( ULONG nListPos, BOOL bDisableCtrls ) const StyleSettings& rStyles = Application::GetSettings().GetStyleSettings(); aVD.SetBackground( Wallpaper( rStyles.GetFieldColor() ) ); aVD.SetDrawMode( rStyles.GetHighContrastMode() - ? ViewShell::OUTPUT_DRAWMODE_CONTRAST + ? ViewShell::OUTPUT_DRAWMODE_CONTRAST : ViewShell::OUTPUT_DRAWMODE_COLOR ); aVD.Erase(); pObject->SingleObjectPainter( aVD ); // #110094#-17 @@ -856,7 +856,7 @@ BOOL AnimationWindow::Close() { SfxBoolItem aItem( SID_ANIMATION_OBJECTS, FALSE ); - GetBindings().GetDispatcher()->Execute( + GetBindings().GetDispatcher()->Execute( SID_ANIMATION_OBJECTS, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); SfxDockingWindow::Close(); @@ -883,9 +883,9 @@ void AnimationWindow::AddObj (::sd::View& rView ) // Objekt(e) clonen und den/die Clone(s) in die Liste stellen const SdrMarkList& rMarkList = rView.GetMarkedObjectList(); - ULONG nMarkCount = rMarkList.GetMarkCount(); - SdPage* pPage = pMyDoc->GetSdPage(0, PK_STANDARD); - ULONG nCloneCount = pPage->GetObjCount(); + ULONG nMarkCount = rMarkList.GetMarkCount(); + SdPage* pPage = pMyDoc->GetSdPage(0, PK_STANDARD); + ULONG nCloneCount = pPage->GetObjCount(); if (nMarkCount > 0) { @@ -895,8 +895,8 @@ void AnimationWindow::AddObj (::sd::View& rView ) BOOL bAnimObj = FALSE; if( nMarkCount == 1 ) { - SdrMark* pMark = rMarkList.GetMark(0); - SdrObject* pObject = pMark->GetMarkedSdrObj(); + SdrMark* pMark = rMarkList.GetMark(0); + SdrObject* pObject = pMark->GetMarkedSdrObj(); SdAnimationInfo* pAnimInfo = rView.GetDoc()->GetAnimationInfo( pObject ); UINT32 nInv = pObject->GetObjInventor(); UINT16 nId = pObject->GetObjIdentifier(); @@ -904,8 +904,8 @@ void AnimationWindow::AddObj (::sd::View& rView ) // Animated Bitmap (GIF) if( nInv == SdrInventor && nId == OBJ_GRAF && ( (SdrGrafObj*) pObject )->IsAnimated() ) { - const SdrGrafObj* pGrafObj = (SdrGrafObj*) pObject; - Graphic aGraphic( pGrafObj->GetTransformedGraphic() ); + const SdrGrafObj* pGrafObj = (SdrGrafObj*) pObject; + Graphic aGraphic( pGrafObj->GetTransformedGraphic() ); USHORT nCount = 0; if( aGraphic.IsAnimated() ) @@ -955,7 +955,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) for( USHORT nObject = 0; nObject < pObjList->GetObjCount(); nObject++ ) { SdrObject* pSnapShot = (SdrObject*) pObjList->GetObj( (ULONG) nObject ); - + pBitmapEx = new BitmapEx( SdrExchangeView::GetObjGraphic( pSnapShot->GetModel(), pSnapShot ).GetBitmapEx() ); aBmpExList.Insert( pBitmapEx, aBmpExList.GetCurPos() + 1 ); @@ -965,7 +965,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) // Clone pPage->InsertObject( pSnapShot->Clone(), aBmpExList.GetCurPos() + 1 ); - + // Weiterschalten der BitmapListe aBmpExList.Next(); } @@ -987,9 +987,9 @@ void AnimationWindow::AddObj (::sd::View& rView ) // ein einzelnes Objekt if( nMarkCount == 1 && !bAnimObj ) { - SdrMark* pMark = rMarkList.GetMark(0); - SdrObject* pObject = pMark->GetMarkedSdrObj(); - SdrObject* pClone = pObject->Clone(); + SdrMark* pMark = rMarkList.GetMark(0); + SdrObject* pObject = pMark->GetMarkedSdrObj(); + SdrObject* pClone = pObject->Clone(); pPage->InsertObject(pClone, aBmpExList.GetCurPos() + 1); } // mehrere Objekte: die Clones zu einer Gruppe zusammenfassen @@ -1019,7 +1019,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) else { SdrObjGroup* pCloneGroup = new SdrObjGroup; - SdrObjList* pObjList = pCloneGroup->GetSubList(); + SdrObjList* pObjList = pCloneGroup->GetSubList(); for (ULONG nObject= 0; nObject < nMarkCount; nObject++) pObjList->InsertObject(rMarkList.GetMark(nObject)->GetMarkedSdrObj()->Clone(), LIST_APPEND); @@ -1052,23 +1052,23 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) DBG_ASSERT( pOutWin, "Window ist nicht vorhanden!" ); // die Fentermitte ermitteln - const MapMode aMap100( MAP_100TH_MM ); - Size aMaxSizeLog; - Size aMaxSizePix; - Size aTemp( pOutWin->GetOutputSizePixel() ); - const Point aWindowCenter( pOutWin->PixelToLogic( Point( aTemp.Width() >> 1, aTemp.Height() >> 1 ) ) ); - const OutputDevice* pDefDev = Application::GetDefaultDevice(); - const ULONG nCount = aBmpExList.Count(); - BitmapAdjustment eBA = (BitmapAdjustment) aLbAdjustment.GetSelectEntryPos(); + const MapMode aMap100( MAP_100TH_MM ); + Size aMaxSizeLog; + Size aMaxSizePix; + Size aTemp( pOutWin->GetOutputSizePixel() ); + const Point aWindowCenter( pOutWin->PixelToLogic( Point( aTemp.Width() >> 1, aTemp.Height() >> 1 ) ) ); + const OutputDevice* pDefDev = Application::GetDefaultDevice(); + const ULONG nCount = aBmpExList.Count(); + BitmapAdjustment eBA = (BitmapAdjustment) aLbAdjustment.GetSelectEntryPos(); ULONG i; // Groesste Bitmap ermitteln for( i = 0; i < nCount; i++ ) { const BitmapEx& rBmpEx = *static_cast< BitmapEx* >( aBmpExList.GetObject( i ) ); - const Graphic aGraphic( rBmpEx ); - Size aTmpSizeLog; - const Size aTmpSizePix( rBmpEx.GetSizePixel() ); + const Graphic aGraphic( rBmpEx ); + Size aTmpSizeLog; + const Size aTmpSizePix( rBmpEx.GetSizePixel() ); if ( aGraphic.GetPrefMapMode().GetMapUnit() == MAP_PIXEL ) aTmpSizeLog = pDefDev->PixelToLogic( aGraphic.GetPrefSize(), aMap100 ); @@ -1087,8 +1087,8 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) if( aRbtBitmap.IsChecked() ) { // Bitmapgruppe erzeugen (Animated GIF) - Animation aAnimation; - Point aPt; + Animation aAnimation; + Point aPt; for( i = 0; i < nCount; i++ ) { @@ -1148,7 +1148,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) AnimationBitmap aAnimBmp; long nLoopCount = 0L; USHORT nPos = aLbLoopCount.GetSelectEntryPos(); - + if( nPos != LISTBOX_ENTRY_NOTFOUND && nPos != aLbLoopCount.GetEntryCount() - 1 ) // unendlich nLoopCount = (long) aLbLoopCount.GetSelectEntry().ToInt32(); @@ -1165,7 +1165,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) } SdrGrafObj* pGrafObj = new SdrGrafObj( Graphic( aAnimation ) ); - const Point aOrg( aWindowCenter.X() - ( aMaxSizeLog.Width() >> 1 ), aWindowCenter.Y() - ( aMaxSizeLog.Height() >> 1 ) ); + const Point aOrg( aWindowCenter.X() - ( aMaxSizeLog.Width() >> 1 ), aWindowCenter.Y() - ( aMaxSizeLog.Height() >> 1 ) ); pGrafObj->SetLogicRect( Rectangle( aOrg, aMaxSizeLog ) ); rView.InsertObjectAtView( pGrafObj, *pPV, SDRINSERT_SETDEFLAYER); @@ -1286,7 +1286,7 @@ void AnimationWindow::DataChanged( const DataChangedEvent& rDCEvt ) AnimationControllerItem::AnimationControllerItem( USHORT _nId, AnimationWindow* pAnimWin, - SfxBindings* _pBindings) + SfxBindings* _pBindings) : SfxControllerItem( _nId, *_pBindings ), pAnimationWin( pAnimWin ) { diff --git a/sd/source/ui/dlg/animobjs.src b/sd/source/ui/dlg/animobjs.src index d631dcaba2b2..8387555f680e 100644 --- a/sd/source/ui/dlg/animobjs.src +++ b/sd/source/ui/dlg/animobjs.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/sd/source/ui/dlg/assclass.cxx b/sd/source/ui/dlg/assclass.cxx index 1df116f52625..969c3f4d3b3f 100644 --- a/sd/source/ui/dlg/assclass.cxx +++ b/sd/source/ui/dlg/assclass.cxx @@ -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/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx index f2c69231d79e..5b98d7cd9466 100644 --- a/sd/source/ui/dlg/brkdlg.cxx +++ b/sd/source/ui/dlg/brkdlg.cxx @@ -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 @@ -57,21 +57,21 @@ namespace sd { \************************************************************************/ BreakDlg::BreakDlg( - ::Window* pWindow, - DrawView* _pDrView, + ::Window* pWindow, + DrawView* _pDrView, DrawDocShell* pShell, - ULONG nSumActionCount, - ULONG nObjCount ) + ULONG nSumActionCount, + ULONG nObjCount ) : SfxModalDialog ( pWindow, SdResId( DLG_BREAK ) ), - aFtObjInfo ( this, SdResId( FT_OBJ_INFO ) ), - aFtActInfo ( this, SdResId( FT_ACT_INFO ) ), - aFtInsInfo ( this, SdResId( FT_INS_INFO ) ), - aFiObjInfo ( this, SdResId( FI_OBJ_INFO ) ), - aFiActInfo ( this, SdResId( FI_ACT_INFO ) ), - aFiInsInfo ( this, SdResId( FI_INS_INFO ) ), - aBtnCancel ( this, SdResId( BTN_CANCEL ) ), - aLink ( LINK( this, BreakDlg, UpDate)), - mpProgress ( NULL ) + aFtObjInfo ( this, SdResId( FT_OBJ_INFO ) ), + aFtActInfo ( this, SdResId( FT_ACT_INFO ) ), + aFtInsInfo ( this, SdResId( FT_INS_INFO ) ), + aFiObjInfo ( this, SdResId( FI_OBJ_INFO ) ), + aFiActInfo ( this, SdResId( FI_ACT_INFO ) ), + aFiInsInfo ( this, SdResId( FI_INS_INFO ) ), + aBtnCancel ( this, SdResId( BTN_CANCEL ) ), + aLink ( LINK( this, BreakDlg, UpDate)), + mpProgress ( NULL ) { aBtnCancel.SetClickHdl( LINK( this, BreakDlg, CancelButtonHdl)); diff --git a/sd/source/ui/dlg/brkdlg.src b/sd/source/ui/dlg/brkdlg.src index bf9b2d29c651..73092421ccf3 100644 --- a/sd/source/ui/dlg/brkdlg.src +++ b/sd/source/ui/dlg/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 diff --git a/sd/source/ui/dlg/celltempl.cxx b/sd/source/ui/dlg/celltempl.cxx index 4938263b97d7..416a0471386d 100644 --- a/sd/source/ui/dlg/celltempl.cxx +++ b/sd/source/ui/dlg/celltempl.cxx @@ -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/sd/source/ui/dlg/celltempl.src b/sd/source/ui/dlg/celltempl.src index 4bdd02a799c2..5236e0a1a0c9 100644 --- a/sd/source/ui/dlg/celltempl.src +++ b/sd/source/ui/dlg/celltempl.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/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index 6b3c04346f31..f3f132e43a79 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -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 @@ -64,10 +64,10 @@ namespace sd { \************************************************************************/ CopyDlg::CopyDlg( - ::Window* pWindow, + ::Window* pWindow, const SfxItemSet& rInAttrs, - XColorTable* pColTab, - ::sd::View* pInView ) + XColorTable* pColTab, + ::sd::View* pInView ) : SfxModalDialog ( pWindow, SdResId( DLG_COPY ) ), maFtCopies ( this, SdResId( FT_COPIES ) ), maNumFldCopies ( this, SdResId( NUM_FLD_COPIES ) ), @@ -93,10 +93,10 @@ CopyDlg::CopyDlg( maBtnCancel ( this, SdResId( BTN_CANCEL ) ), maBtnHelp ( this, SdResId( BTN_HELP ) ), maBtnSetDefault ( this, SdResId( BTN_SET_DEFAULT ) ), - mrOutAttrs ( rInAttrs ), - mpColorTab ( pColTab ), + mrOutAttrs ( rInAttrs ), + mpColorTab ( pColTab ), maUIScale(pInView->GetDoc()->GetUIScale()), - mpView ( pInView ) + mpView ( pInView ) { FreeResource(); @@ -314,7 +314,7 @@ IMPL_LINK( CopyDlg, SetViewData, void*, EMPTYARG ) maUIScale, SFX_MAPUNIT_100TH_MM); // Farb-Attribut setzen - const SfxPoolItem* pPoolItem = NULL; + const SfxPoolItem* pPoolItem = NULL; if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, TRUE, &pPoolItem ) ) { Color aColor = ( ( const XColorItem* ) pPoolItem )->GetColorValue(); @@ -342,7 +342,7 @@ IMPL_LINK( CopyDlg, SetDefault, void*, EMPTYARG ) SetMetricValue( maMtrFldHeight, Fraction(nValue) / maUIScale, SFX_MAPUNIT_100TH_MM); // Farb-Attribut setzen - const SfxPoolItem* pPoolItem = NULL; + const SfxPoolItem* pPoolItem = NULL; if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, TRUE, &pPoolItem ) ) { Color aColor = ( ( const XColorItem* ) pPoolItem )->GetColorValue(); diff --git a/sd/source/ui/dlg/copydlg.src b/sd/source/ui/dlg/copydlg.src index 920be5e8df70..bf4f87ec5686 100644 --- a/sd/source/ui/dlg/copydlg.src +++ b/sd/source/ui/dlg/copydlg.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/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index b8c92dee3a6e..0c098573b3f2 100755 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -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 @@ -55,22 +55,22 @@ \************************************************************************/ SdCustomShowDlg::SdCustomShowDlg( Window* pWindow, SdDrawDocument& rDrawDoc ) : - ModalDialog ( pWindow, SdResId( DLG_CUSTOMSHOW ) ), + ModalDialog ( pWindow, SdResId( DLG_CUSTOMSHOW ) ), - aLbCustomShows ( this, SdResId( LB_CUSTOMSHOWS ) ), + aLbCustomShows ( this, SdResId( LB_CUSTOMSHOWS ) ), aCbxUseCustomShow( this, SdResId( CBX_USE_CUSTOMSHOW ) ), - aBtnNew ( this, SdResId( BTN_NEW ) ), - aBtnEdit ( this, SdResId( BTN_EDIT ) ), - aBtnRemove ( this, SdResId( BTN_REMOVE ) ), - aBtnCopy ( this, SdResId( BTN_COPY ) ), + aBtnNew ( this, SdResId( BTN_NEW ) ), + aBtnEdit ( this, SdResId( BTN_EDIT ) ), + aBtnRemove ( this, SdResId( BTN_REMOVE ) ), + aBtnCopy ( this, SdResId( BTN_COPY ) ), aBtnHelp ( this, SdResId( BTN_HELP ) ), - aBtnStartShow ( this, SdResId( BTN_STARTSHOW ) ), + aBtnStartShow ( this, SdResId( BTN_STARTSHOW ) ), aBtnOK ( this, SdResId( BTN_OK ) ), - rDoc ( rDrawDoc ), - pCustomShowList ( NULL ), - pCustomShow ( NULL ), - bModified ( FALSE ) + rDoc ( rDrawDoc ), + pCustomShowList ( NULL ), + pCustomShow ( NULL ), + bModified ( FALSE ) { FreeResource(); @@ -310,23 +310,23 @@ BOOL SdCustomShowDlg::IsCustomShow() const \************************************************************************/ SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window* pWindow, SdDrawDocument& rDrawDoc, SdCustomShow*& rpCS ) : - ModalDialog ( pWindow, SdResId( DLG_DEFINE_CUSTOMSHOW ) ), - - aFtName ( this, SdResId( FT_NAME ) ), - aEdtName ( this, SdResId( EDT_NAME ) ), - aFtPages ( this, SdResId( FT_PAGES ) ), - aLbPages ( this, SdResId( LB_PAGES ) ), - aBtnAdd ( this, SdResId( BTN_ADD ) ), - aBtnRemove ( this, SdResId( BTN_REMOVE ) ), - aFtCustomPages ( this, SdResId( FT_CUSTOM_PAGES ) ), - aLbCustomPages ( this, SdResId( LB_CUSTOM_PAGES ) ), + ModalDialog ( pWindow, SdResId( DLG_DEFINE_CUSTOMSHOW ) ), + + aFtName ( this, SdResId( FT_NAME ) ), + aEdtName ( this, SdResId( EDT_NAME ) ), + aFtPages ( this, SdResId( FT_PAGES ) ), + aLbPages ( this, SdResId( LB_PAGES ) ), + aBtnAdd ( this, SdResId( BTN_ADD ) ), + aBtnRemove ( this, SdResId( BTN_REMOVE ) ), + aFtCustomPages ( this, SdResId( FT_CUSTOM_PAGES ) ), + aLbCustomPages ( this, SdResId( LB_CUSTOM_PAGES ) ), aBtnOK ( this, SdResId( BTN_OK ) ), - aBtnCancel ( this, SdResId( BTN_CANCEL ) ), + aBtnCancel ( this, SdResId( BTN_CANCEL ) ), aBtnHelp ( this, SdResId( BTN_HELP ) ), - rDoc ( rDrawDoc ), - rpCustomShow ( rpCS ), - bModified ( FALSE ) + rDoc ( rDrawDoc ), + rpCustomShow ( rpCS ), + bModified ( FALSE ) { FreeResource(); diff --git a/sd/source/ui/dlg/custsdlg.src b/sd/source/ui/dlg/custsdlg.src index c8c49e9c0d48..f5e4195b5a96 100644 --- a/sd/source/ui/dlg/custsdlg.src +++ b/sd/source/ui/dlg/custsdlg.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/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx index 7725dc97f1e0..3142c4c438f8 100644 --- a/sd/source/ui/dlg/diactrl.cxx +++ b/sd/source/ui/dlg/diactrl.cxx @@ -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 @@ -53,11 +53,11 @@ SFX_IMPL_TOOLBOX_CONTROL( SdTbxCtlDiaPages, SfxUInt16Item ) // SdPagesField //======================================================================== -SdPagesField::SdPagesField( Window* pParent, - const uno::Reference< frame::XFrame >& rFrame, +SdPagesField::SdPagesField( Window* pParent, + const uno::Reference< frame::XFrame >& rFrame, WinBits nBits ) : - SvxMetricField ( pParent, rFrame, nBits ), - m_xFrame ( rFrame ) + SvxMetricField ( pParent, rFrame, nBits ), + m_xFrame ( rFrame ) { String aStr( SdResId( STR_SLIDE_PLURAL ) ); SetCustomUnitText( aStr ); @@ -118,7 +118,7 @@ void SdPagesField::Modify() rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PagesPerRow" )), aArgs ); /* - rBindings.GetDispatcher()->Execute( + rBindings.GetDispatcher()->Execute( SID_PAGES_PER_ROW, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L, 0L ); */ } @@ -163,7 +163,7 @@ void SdTbxCtlDiaPages::StateChanged( USHORT, pItem = dynamic_cast< const SfxUInt16Item* >( pState ); DBG_ASSERT( pItem, "sd::SdTbxCtlDiaPages::StateChanged(), wrong item type!" ); } - + pFld->UpdatePagesField( pItem ); } } diff --git a/sd/source/ui/dlg/dlg_char.src b/sd/source/ui/dlg/dlg_char.src index e8d09c1c3170..a04db7cc2b44 100644 --- a/sd/source/ui/dlg/dlg_char.src +++ b/sd/source/ui/dlg/dlg_char.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 @@ -34,7 +34,7 @@ TabDialog TAB_CHAR Size = MAP_APPFONT ( 289 , 176 ) ; Text [ en-US ] = "Character" ; Moveable = TRUE ; - // Closeable = TRUE; // Dieser Dialog enthaelt OK und/oder Cancel Button (KH) + // Closeable = TRUE; // Dieser Dialog enthaelt OK und/oder Cancel Button (KH) TabControl 1 { OutputSize = TRUE ; diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 1eb3a3d0cedc..6b623f583ca5 100755 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -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 @@ -164,16 +164,16 @@ public: /** closes the current preview docshell */ void CloseDocShell(); - /** Extract form the history list of recently used files the impress + /** Extract form the history list of recently used files the impress files and insert them into a listbox. */ - void ScanDocmenu (void); - /** Flag that is set to TRUE after the recently used files have been + void ScanDocmenu (void); + /** Flag that is set to TRUE after the recently used files have been scanned. */ BOOL mbRecentDocumentsReady; - /** When the list of templates has not been scanned already this is done + /** When the list of templates has not been scanned already this is done when this method is called. That includes requesting the whole list of templates from UCB and extracting from that list the impress templates and layouts and storing them for later use in @@ -182,7 +182,7 @@ public: */ void ProvideTemplates (void); - /** This method transfers the template folders from the template scanner + /** This method transfers the template folders from the template scanner to the internal structures of this class. On termination it sets the flag <member>mbTemplatesReady</member> to <TRUE/> to indicate that the templates are available. @@ -193,7 +193,7 @@ public: */ void TemplateScanDone (std::vector<TemplateDir*>& rTemplateFolders); - /** Flag that is set to TRUE after the impress templates have been + /** Flag that is set to TRUE after the impress templates have been scanned. */ BOOL mbTemplatesReady; @@ -219,16 +219,16 @@ public: String GetDocFileName(); String GetLayoutFileName(); - /// List of URLs of recently used impress files. + /// List of URLs of recently used impress files. std::vector<String*> maOpenFilesList; - /// List of folders containing data about impress templates. + /// List of folders containing data about impress templates. std::vector<TemplateDir*> maPresentList; - /// Currently selected template folder. + /// Currently selected template folder. TemplateDir* mpTemplateRegion; - /// Currently selected layout folder. + /// Currently selected layout folder. TemplateDir* mpLayoutRegion; // preview @@ -291,73 +291,73 @@ public: DECL_LINK( OpenButtonHdl, Button * ); // Common - Assistent maAssistentFunc; - CheckBox maPreviewFlag; - CheckBox maStartWithFlag; - HelpButton maHelpButton; - CancelButton maCancelButton; - PushButton maLastPageButton; - NextButton maNextPageButton; - OKButton maFinishButton; - SdDocPreviewWin maPreview; - - String maCreateStr; - String maOpenStr; + Assistent maAssistentFunc; + CheckBox maPreviewFlag; + CheckBox maStartWithFlag; + HelpButton maHelpButton; + CancelButton maCancelButton; + PushButton maLastPageButton; + NextButton maNextPageButton; + OKButton maFinishButton; + SdDocPreviewWin maPreview; + + String maCreateStr; + String maOpenStr; // Seite 1 - FixedBitmap* mpPage1FB; - FixedLine* mpPage1ArtFL; - RadioButton* mpPage1EmptyRB; - RadioButton* mpPage1TemplateRB; - ListBox* mpPage1RegionLB; - ListBox* mpPage1TemplateLB; - RadioButton* mpPage1OpenRB; - ListBox* mpPage1OpenLB; + FixedBitmap* mpPage1FB; + FixedLine* mpPage1ArtFL; + RadioButton* mpPage1EmptyRB; + RadioButton* mpPage1TemplateRB; + ListBox* mpPage1RegionLB; + ListBox* mpPage1TemplateLB; + RadioButton* mpPage1OpenRB; + ListBox* mpPage1OpenLB; PushButton* mpPage1OpenPB; // Seite 2 - FixedBitmap* mpPage2FB; - FixedLine* mpPage2LayoutFL; - ListBox* mpPage2RegionLB; - ListBox* mpPage2LayoutLB; - FixedLine* mpPage2OutTypesFL; - RadioButton* mpPage2Medium1RB; - RadioButton* mpPage2Medium2RB; - RadioButton* mpPage2Medium3RB; - RadioButton* mpPage2Medium4RB; - RadioButton* mpPage2Medium5RB; + FixedBitmap* mpPage2FB; + FixedLine* mpPage2LayoutFL; + ListBox* mpPage2RegionLB; + ListBox* mpPage2LayoutLB; + FixedLine* mpPage2OutTypesFL; + RadioButton* mpPage2Medium1RB; + RadioButton* mpPage2Medium2RB; + RadioButton* mpPage2Medium3RB; + RadioButton* mpPage2Medium4RB; + RadioButton* mpPage2Medium5RB; // Seite 3 - FixedBitmap* mpPage3FB; - FixedLine* mpPage3EffectFL; - FixedText* mpPage3EffectFT; - FadeEffectLB* mpPage3EffectLB; - FixedText* mpPage3SpeedFT; - ListBox* mpPage3SpeedLB; - FixedLine* mpPage3PresTypeFL; - RadioButton* mpPage3PresTypeLiveRB; - RadioButton* mpPage3PresTypeKioskRB; - FixedText* mpPage3PresTimeFT; - TimeField* mpPage3PresTimeTMF; - FixedText* mpPage3BreakFT; - TimeField* mpPage3BreakTMF; - CheckBox* mpPage3LogoCB; + FixedBitmap* mpPage3FB; + FixedLine* mpPage3EffectFL; + FixedText* mpPage3EffectFT; + FadeEffectLB* mpPage3EffectLB; + FixedText* mpPage3SpeedFT; + ListBox* mpPage3SpeedLB; + FixedLine* mpPage3PresTypeFL; + RadioButton* mpPage3PresTypeLiveRB; + RadioButton* mpPage3PresTypeKioskRB; + FixedText* mpPage3PresTimeFT; + TimeField* mpPage3PresTimeTMF; + FixedText* mpPage3BreakFT; + TimeField* mpPage3BreakTMF; + CheckBox* mpPage3LogoCB; // Seite 4 - FixedBitmap* mpPage4FB; - FixedLine* mpPage4PersonalFL; - FixedText* mpPage4AskNameFT; - Edit* mpPage4AskNameEDT; - FixedText* mpPage4AskTopicFT; - Edit* mpPage4AskTopicEDT; - FixedText* mpPage4AskInfoFT; - MultiLineEdit* mpPage4AskInfoEDT; + FixedBitmap* mpPage4FB; + FixedLine* mpPage4PersonalFL; + FixedText* mpPage4AskNameFT; + Edit* mpPage4AskNameEDT; + FixedText* mpPage4AskTopicFT; + Edit* mpPage4AskTopicEDT; + FixedText* mpPage4AskInfoFT; + MultiLineEdit* mpPage4AskInfoEDT; // Seite 5 - FixedBitmap* mpPage5FB; - FixedText* mpPage5PageListFT; - SdPageListControl* mpPage5PageListCT; - CheckBox* mpPage5SummaryCB; + FixedBitmap* mpPage5FB; + FixedText* mpPage5PageListFT; + SdPageListControl* mpPage5PageListCT; + CheckBox* mpPage5SummaryCB; }; @@ -466,7 +466,7 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, mpPage1OpenLB->SetSelectHdl(LINK(this,AssistentDlgImpl,SelectFileHdl)); mpPage1OpenLB->SetDoubleClickHdl(rFinishLink); mpPage1OpenPB->SetClickHdl(LINK(this,AssistentDlgImpl,OpenButtonHdl)); - // mpPage1OpenLB->InsertEntry(String(SdResId(STR_WIZARD_POSITION))); + // mpPage1OpenLB->InsertEntry(String(SdResId(STR_WIZARD_POSITION))); // Seite 2 maAssistentFunc.InsertControl(2, &maPreview ); @@ -532,7 +532,7 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, mpPage3LogoCB = new CheckBox( pWindow, SdResId( CB_PAGE3_LOGO) )); mpPage3EffectLB->Fill(); -// mpPage3EffectLB->SelectEffect( presentation::FadeEffect_NONE ); +// mpPage3EffectLB->SelectEffect( presentation::FadeEffect_NONE ); mpPage3EffectLB->SetSelectHdl( LINK(this,AssistentDlgImpl,SelectEffectHdl )); mpPage3EffectLB->SetDropDownLineCount( 12 ); @@ -643,11 +643,11 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, TemplateDir* pStandardTemplateDir = 0; TemplateEntry* pStandardTemplateEntry = 0; - std::vector<TemplateDir*>::iterator I; + std::vector<TemplateDir*>::iterator I; for (I=maPresentList.begin(); I!=maPresentList.end(); I++) { TemplateDir* pDir = *I; - std::vector<TemplateEntry*>::iterator J; + std::vector<TemplateEntry*>::iterator J; for (J=pDir->maEntries.begin(); J!=pDir->maEntries.end(); J++) { TemplateEntry* pEntry = *J; @@ -682,9 +682,9 @@ AssistentDlgImpl::~AssistentDlgImpl() DeletePassords(); - // Delete the template file infos. - std::vector<TemplateDir*>::iterator I; - std::vector<TemplateEntry*>::iterator J; + // Delete the template file infos. + std::vector<TemplateDir*>::iterator I; + std::vector<TemplateEntry*>::iterator J; for (I=maPresentList.begin(); I!=maPresentList.end(); I++) { for (J=(*I)->maEntries.begin(); J!=(*I)->maEntries.end(); J++) @@ -747,8 +747,8 @@ AssistentDlgImpl::~AssistentDlgImpl() delete mpPage5PageListCT; delete mpPage5SummaryCB; - // Delete the file history list. - std::vector<String*>::iterator I2; + // Delete the file history list. + std::vector<String*>::iterator I2; for (I2=maOpenFilesList.begin(); I2!=maOpenFilesList.end(); I2++) delete *I2; } @@ -782,7 +782,7 @@ void AssistentDlgImpl::EndDialog( long ) -void AssistentDlgImpl::ScanDocmenu (void) +void AssistentDlgImpl::ScanDocmenu (void) { if( mbRecentDocumentsReady ) return; @@ -801,12 +801,12 @@ void AssistentDlgImpl::ScanDocmenu (void) sal_uInt32 nCount = aHistory.getLength(); for (sal_uInt32 nItem=0; nItem<nCount; ++nItem) { - // Get the current history item's properties. + // Get the current history item's properties. uno::Sequence<beans::PropertyValue> aPropertySet = aHistory[nItem]; - rtl::OUString sURL; - rtl::OUString sFilter; - rtl::OUString sTitle; - rtl::OUString sPassword; + rtl::OUString sURL; + rtl::OUString sFilter; + rtl::OUString sTitle; + rtl::OUString sPassword; sal_uInt32 nPropertyCount = aPropertySet.getLength(); for (sal_uInt32 nProperty=0; nProperty<nPropertyCount; ++nProperty) if (aPropertySet[nProperty].Name == HISTORY_PROPERTYNAME_URL) @@ -818,8 +818,8 @@ void AssistentDlgImpl::ScanDocmenu (void) else if (aPropertySet[nProperty].Name == HISTORY_PROPERTYNAME_PASSWORD) aPropertySet[nProperty].Value >>= sPassword; - // If the entry is an impress file then insert it into the - // history list and the list box. + // If the entry is an impress file then insert it into the + // history list and the list box. uno::Sequence< beans::PropertyValue > lProps; if (xFilterFactory->hasByName(sFilter)) { @@ -888,17 +888,17 @@ void AssistentDlgImpl::ProvideTemplates (void) void AssistentDlgImpl::TemplateScanDone ( std::vector<TemplateDir*>& rTemplateFolder) { - // This method is called from a thread. Therefore we get the solar mutex. + // This method is called from a thread. Therefore we get the solar mutex. ::vos::OGuard aGuard (Application::GetSolarMutex()); // Copy the contents of the given template folders to a local list. maPresentList.swap (rTemplateFolder); - // Fill in the list box on the first page. + // Fill in the list box on the first page. int nFirstEntry = 0; mpPage1RegionLB->Clear(); - std::vector<TemplateDir*>::iterator I; - int i; + std::vector<TemplateDir*>::iterator I; + int i; for (i=0,I=maPresentList.begin(); I!=maPresentList.end(); I++,i++) { TemplateDir* pDir = *I; @@ -921,7 +921,7 @@ void AssistentDlgImpl::TemplateScanDone ( mpPage1RegionLB->Update(); SelectTemplateRegion (mpPage1RegionLB->GetSelectEntry()); - // Fill in the list box on the second page. + // Fill in the list box on the second page. nFirstEntry = 0; mpPage2RegionLB->Clear(); for (i=0,I=maPresentList.begin(); I!=maPresentList.end(); I++,i++) @@ -946,7 +946,7 @@ void AssistentDlgImpl::TemplateScanDone ( mpPage2RegionLB->Update(); SelectLayoutRegion (mpPage2RegionLB->GetSelectEntry()); - // Make the changes visible. + // Make the changes visible. mbTemplatesReady = TRUE; if (mpWindow) UpdatePage(); @@ -1044,8 +1044,8 @@ String AssistentDlgImpl::GetLayoutFileName() SfxObjectShellLock AssistentDlgImpl::GetDocument() { -// mbPreview = FALSE; // Document nicht anzeigen - UpdatePreview(FALSE); // aber komplett laden +// mbPreview = FALSE; // Document nicht anzeigen + UpdatePreview(FALSE); // aber komplett laden UpdatePageList(); SfxObjectShell* pShell = xDocShell; @@ -1086,7 +1086,7 @@ SfxObjectShellLock AssistentDlgImpl::GetDocument() { // diese Seite loeschen pDoc->DeletePage( (nPgRelNum << 1) + 2 ); // Notizseite loeschen - pDoc->DeletePage( (nPgRelNum << 1) + 1 ); // Seite loeschen + pDoc->DeletePage( (nPgRelNum << 1) + 1 ); // Seite loeschen } nPgAbsNum++; @@ -1380,14 +1380,14 @@ IMPL_LINK( AssistentDlgImpl, UpdateUserDataHdl, Edit*, EMPTYARG ) void AssistentDlgImpl::SelectTemplateRegion( const String& rRegion ) { mpPage1TemplateLB->Clear(); - std::vector<TemplateDir*>::iterator I; + std::vector<TemplateDir*>::iterator I; for (I=maPresentList.begin(); I!=maPresentList.end(); I++) { TemplateDir * pDir = *I; mpTemplateRegion = *I; if (pDir->msRegion.Equals( rRegion ) ) { - std::vector<TemplateEntry*>::iterator J; + std::vector<TemplateEntry*>::iterator J; for (J=pDir->maEntries.begin(); J!=pDir->maEntries.end(); J++) mpPage1TemplateLB->InsertEntry ((*J)->msTitle); mpPage1TemplateLB->Update(); @@ -1405,7 +1405,7 @@ void AssistentDlgImpl::SelectLayoutRegion( const String& rRegion ) { mpPage2LayoutLB->Clear(); mpPage2LayoutLB->InsertEntry(String(SdResId(STR_WIZARD_ORIGINAL))); - std::vector<TemplateDir*>::iterator I; + std::vector<TemplateDir*>::iterator I; for (I=maPresentList.begin(); I!=maPresentList.end(); I++) { TemplateDir * pDir = *I; @@ -1413,7 +1413,7 @@ void AssistentDlgImpl::SelectLayoutRegion( const String& rRegion ) if (pDir->msRegion.Equals (rRegion)) { - std::vector<TemplateEntry*>::iterator J; + std::vector<TemplateEntry*>::iterator J; for (J=pDir->maEntries.begin(); J!=pDir->maEntries.end(); J++) mpPage2LayoutLB->InsertEntry ((*J)->msTitle); mpPage2LayoutLB->Update(); @@ -1741,8 +1741,8 @@ void AssistentDlgImpl::DeletePassords() BOOL AssistentDlgImpl::IsOwnFormat( const String& rPath ) { - INetURLObject aURL( rPath ); - String aExt( aURL.GetFileExtension() ); + INetURLObject aURL( rPath ); + String aExt( aURL.GetFileExtension() ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); diff --git a/sd/source/ui/dlg/dlgass.src b/sd/source/ui/dlg/dlgass.src index b4c146eb0df2..2e3e0e3de643 100644 --- a/sd/source/ui/dlg/dlgass.src +++ b/sd/source/ui/dlg/dlgass.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 @@ -530,7 +530,7 @@ ModalDialog DLG_ASS TabStop = TRUE ; Text [ en-US ] = "~Create" ; }; - + String STR_OPEN { Text [ en-US ] = "~Open"; diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx index f9dcf5046189..2e944ee32c08 100755 --- a/sd/source/ui/dlg/dlgassim.cxx +++ b/sd/source/ui/dlg/dlgassim.cxx @@ -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 @@ -95,7 +95,7 @@ SvLBoxEntry* SdPageListControl::InsertPage( const String& rPageName ) pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, m_pCheckButton)); - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! pEntry->AddItem( new SvLBoxString( pEntry, 0, rPageName ) ); GetModel()->Insert( pEntry ); @@ -107,7 +107,7 @@ void SdPageListControl::InsertTitle( SvLBoxEntry* pParent, const String& rTitle { SvLBoxEntry* pEntry = new SvLBoxEntry; pEntry->AddItem( new SvLBoxString( pEntry, 0, String() ) ); - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! pEntry->AddItem( new SvLBoxString( pEntry, 0, rTitle ) ); GetModel()->Insert( pEntry,pParent ); } @@ -134,7 +134,7 @@ void SdPageListControl::Fill( SdDrawDocument* pDoc ) for (ULONG nObject = 0; nObject < nObjectCount; nObject++) { SdrObject* pObject = pPage->GetObj(nObject); - if (pObject->GetObjInventor() == SdrInventor && pObject->GetObjIdentifier() == OBJ_OUTLINETEXT) + if (pObject->GetObjInventor() == SdrInventor && pObject->GetObjIdentifier() == OBJ_OUTLINETEXT) { pTO = (SdrTextObj*)pObject; break; diff --git a/sd/source/ui/dlg/dlgassim.hxx b/sd/source/ui/dlg/dlgassim.hxx index 35bbd41de448..ee68c66a9279 100755 --- a/sd/source/ui/dlg/dlgassim.hxx +++ b/sd/source/ui/dlg/dlgassim.hxx @@ -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 @@ -35,7 +35,7 @@ class SdPageListControl : public SvTreeListBox { private: - SvLBoxButtonData* m_pCheckButton; + SvLBoxButtonData* m_pCheckButton; SvLBoxEntry* InsertPage( const String& rPageName ); void InsertTitle( SvLBoxEntry* pEntry, const String& rTitle ); @@ -63,8 +63,8 @@ DECLARE_LIST( TemplateCacheInfoList, TemplateCacheInfo * ) class TemplateCacheDirEntry { public: - String m_aPath; - TemplateCacheInfoList m_aFiles; + String m_aPath; + TemplateCacheInfoList m_aFiles; }; DECLARE_LIST( TemplateCacheDirEntryList, TemplateCacheDirEntry * ) diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx index d0c412ca6f10..14db955a934e 100644 --- a/sd/source/ui/dlg/dlgchar.cxx +++ b/sd/source/ui/dlg/dlgchar.cxx @@ -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 @@ -52,8 +52,8 @@ SdCharDlg::SdCharDlg( Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell ) : SfxTabDialog ( pParent, SdResId( TAB_CHAR ), pAttr ), - rOutAttrs ( *pAttr ), - rDocShell ( *pDocShell ) + rOutAttrs ( *pAttr ), + rDocShell ( *pDocShell ) { FreeResource(); diff --git a/sd/source/ui/dlg/dlgctrls.cxx b/sd/source/ui/dlg/dlgctrls.cxx index 1a5a612d37ad..6522ab87c56e 100755 --- a/sd/source/ui/dlg/dlgctrls.cxx +++ b/sd/source/ui/dlg/dlgctrls.cxx @@ -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 @@ -45,8 +45,8 @@ struct FadeEffectLBImpl std::vector< TransitionPresetPtr > maPresets; }; -FadeEffectLB::FadeEffectLB( Window* pParent, SdResId Id ) -: ListBox( pParent, Id ), +FadeEffectLB::FadeEffectLB( Window* pParent, SdResId Id ) +: ListBox( pParent, Id ), mpImpl( new FadeEffectLBImpl ) { } diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index 6778f073aaa9..9b175cd128b6 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -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 @@ -61,18 +61,18 @@ SdModifyFieldDlg::SdModifyFieldDlg( Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) : ModalDialog ( pWindow, SdResId( DLG_FIELD_MODIFY ) ), - aRbtFix ( this, SdResId( RBT_FIX ) ), - aRbtVar ( this, SdResId( RBT_VAR ) ), - aGrpType ( this, SdResId( GRP_TYPE ) ), + aRbtFix ( this, SdResId( RBT_FIX ) ), + aRbtVar ( this, SdResId( RBT_VAR ) ), + aGrpType ( this, SdResId( GRP_TYPE ) ), maFtLanguage( this, SdResId( FT_LANGUAGE ) ), maLbLanguage( this, SdResId( LB_LANGUAGE ) ), - aFtFormat ( this, SdResId( FT_FORMAT ) ), - aLbFormat ( this, SdResId( LB_FORMAT ) ), + aFtFormat ( this, SdResId( FT_FORMAT ) ), + aLbFormat ( this, SdResId( LB_FORMAT ) ), aBtnOK ( this, SdResId( BTN_OK ) ), aBtnCancel ( this, SdResId( BTN_CANCEL ) ), aBtnHelp ( this, SdResId( BTN_HELP ) ), - maInputSet ( rSet ), - pField ( pInField ) + maInputSet ( rSet ), + pField ( pInField ) { FreeResource(); @@ -99,7 +99,7 @@ SvxFieldData* SdModifyFieldDlg::GetField() if( pField->ISA( SvxDateField ) ) { const SvxDateField* pDateField = (const SvxDateField*) pField; - SvxDateType eType; + SvxDateType eType; SvxDateFormat eFormat; if( aRbtFix.IsChecked() ) @@ -116,7 +116,7 @@ SvxFieldData* SdModifyFieldDlg::GetField() else if( pField->ISA( SvxExtTimeField ) ) { const SvxExtTimeField* pTimeField = (const SvxExtTimeField*) pField; - SvxTimeType eType; + SvxTimeType eType; SvxTimeFormat eFormat; if( aRbtFix.IsChecked() ) @@ -133,7 +133,7 @@ SvxFieldData* SdModifyFieldDlg::GetField() else if( pField->ISA( SvxExtFileField ) ) { const SvxExtFileField* pFileField = (const SvxExtFileField*) pField; - SvxFileType eType; + SvxFileType eType; SvxFileFormat eFormat; if( aRbtFix.IsChecked() ) @@ -162,7 +162,7 @@ SvxFieldData* SdModifyFieldDlg::GetField() } else if( pField->ISA( SvxAuthorField ) ) { - SvxAuthorType eType; + SvxAuthorType eType; SvxAuthorFormat eFormat; if( aRbtFix.IsChecked() ) @@ -200,23 +200,23 @@ void SdModifyFieldDlg::FillFormatList() const SvxDateField* pDateField = (const SvxDateField*) pField; SvxDateField aDateField( *pDateField ); - //SVXDATEFORMAT_APPDEFAULT, // Wird nicht benutzt - //SVXDATEFORMAT_SYSTEM, // Wird nicht benutzt + //SVXDATEFORMAT_APPDEFAULT, // Wird nicht benutzt + //SVXDATEFORMAT_SYSTEM, // Wird nicht benutzt aLbFormat.InsertEntry( String( SdResId( STR_STANDARD_SMALL ) ) ); aLbFormat.InsertEntry( String( SdResId( STR_STANDARD_BIG ) ) ); SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter(); - aDateField.SetFormat( SVXDATEFORMAT_A ); // 13.02.96 + aDateField.SetFormat( SVXDATEFORMAT_A ); // 13.02.96 aLbFormat.InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); - aDateField.SetFormat( SVXDATEFORMAT_B ); // 13.02.1996 + aDateField.SetFormat( SVXDATEFORMAT_B ); // 13.02.1996 aLbFormat.InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); - aDateField.SetFormat( SVXDATEFORMAT_C ); // 13.Feb 1996 + aDateField.SetFormat( SVXDATEFORMAT_C ); // 13.Feb 1996 aLbFormat.InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); - aDateField.SetFormat( SVXDATEFORMAT_D ); // 13.Februar 1996 + aDateField.SetFormat( SVXDATEFORMAT_D ); // 13.Februar 1996 aLbFormat.InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); - aDateField.SetFormat( SVXDATEFORMAT_E ); // Die, 13.Februar 1996 + aDateField.SetFormat( SVXDATEFORMAT_E ); // Die, 13.Februar 1996 aLbFormat.InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); - aDateField.SetFormat( SVXDATEFORMAT_F ); // Dienstag, 13.Februar 1996 + aDateField.SetFormat( SVXDATEFORMAT_F ); // Dienstag, 13.Februar 1996 aLbFormat.InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); aLbFormat.SelectEntryPos( (USHORT) ( pDateField->GetFormat() - 2 ) ); @@ -226,26 +226,26 @@ void SdModifyFieldDlg::FillFormatList() const SvxExtTimeField* pTimeField = (const SvxExtTimeField*) pField; SvxExtTimeField aTimeField( *pTimeField ); - //SVXTIMEFORMAT_APPDEFAULT, // Wird nicht benutzt - //SVXTIMEFORMAT_SYSTEM, // Wird nicht benutzt + //SVXTIMEFORMAT_APPDEFAULT, // Wird nicht benutzt + //SVXTIMEFORMAT_SYSTEM, // Wird nicht benutzt aLbFormat.InsertEntry( String( SdResId( STR_STANDARD_NORMAL ) ) ); SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter(); - aTimeField.SetFormat( SVXTIMEFORMAT_24_HM ); // 13:49 + aTimeField.SetFormat( SVXTIMEFORMAT_24_HM ); // 13:49 aLbFormat.InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) ); - aTimeField.SetFormat( SVXTIMEFORMAT_24_HMS ); // 13:49:38 + aTimeField.SetFormat( SVXTIMEFORMAT_24_HMS ); // 13:49:38 aLbFormat.InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) ); - aTimeField.SetFormat( SVXTIMEFORMAT_24_HMSH ); // 13:49:38.78 + aTimeField.SetFormat( SVXTIMEFORMAT_24_HMSH ); // 13:49:38.78 aLbFormat.InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) ); - aTimeField.SetFormat( SVXTIMEFORMAT_12_HM ); // 01:49 + aTimeField.SetFormat( SVXTIMEFORMAT_12_HM ); // 01:49 aLbFormat.InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) ); - aTimeField.SetFormat( SVXTIMEFORMAT_12_HMS ); // 01:49:38 + aTimeField.SetFormat( SVXTIMEFORMAT_12_HMS ); // 01:49:38 aLbFormat.InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) ); - aTimeField.SetFormat( SVXTIMEFORMAT_12_HMSH ); // 01:49:38.78 + aTimeField.SetFormat( SVXTIMEFORMAT_12_HMSH ); // 01:49:38.78 aLbFormat.InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) ); - //SVXTIMEFORMAT_AM_HM, // 01:49 PM - //SVXTIMEFORMAT_AM_HMS, // 01:49:38 PM - //SVXTIMEFORMAT_AM_HMSH // 01:49:38.78 PM + //SVXTIMEFORMAT_AM_HM, // 01:49 PM + //SVXTIMEFORMAT_AM_HMS, // 01:49:38 PM + //SVXTIMEFORMAT_AM_HMSH // 01:49:38.78 PM aLbFormat.SelectEntryPos( (USHORT) ( pTimeField->GetFormat() - 2 ) ); } diff --git a/sd/source/ui/dlg/dlgfield.src b/sd/source/ui/dlg/dlgfield.src index 5abcd9e8b9b7..679c21fffc77 100644 --- a/sd/source/ui/dlg/dlgfield.src +++ b/sd/source/ui/dlg/dlgfield.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/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index bbd32f6bd807..02803f2ced45 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -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 @@ -75,10 +75,10 @@ OutlineBulletDlg::OutlineBulletDlg( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) - : SfxTabDialog ( pParent, SdResId(TAB_OUTLINEBULLET) ), - aInputSet ( *pAttr ), - bTitle ( FALSE ), - pSdView ( pView ) + : SfxTabDialog ( pParent, SdResId(TAB_OUTLINEBULLET) ), + aInputSet ( *pAttr ), + bTitle ( FALSE ), + pSdView ( pView ) { FreeResource(); @@ -169,8 +169,8 @@ OutlineBulletDlg::OutlineBulletDlg( AddTabPage( RID_SVXPAGE_PICK_BULLET ); AddTabPage( RID_SVXPAGE_PICK_BMP ); - AddTabPage(RID_SVXPAGE_NUM_OPTIONS ); - AddTabPage(RID_SVXPAGE_NUM_POSITION ); + AddTabPage(RID_SVXPAGE_NUM_OPTIONS ); + AddTabPage(RID_SVXPAGE_NUM_POSITION ); } diff --git a/sd/source/ui/dlg/dlgolbul.src b/sd/source/ui/dlg/dlgolbul.src index 0f35c8b44d98..70b1f1070401 100644 --- a/sd/source/ui/dlg/dlgolbul.src +++ b/sd/source/ui/dlg/dlgolbul.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/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx index f2dea0f67e2f..d38314675a5b 100644 --- a/sd/source/ui/dlg/dlgpage.cxx +++ b/sd/source/ui/dlg/dlgpage.cxx @@ -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 @@ -57,8 +57,8 @@ SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, BOOL bAreaPage ) : SfxTabDialog ( pParent, SdResId( TAB_PAGE ), pAttr ), - mrOutAttrs ( *pAttr ), - mpDocShell ( pDocSh ) + mrOutAttrs ( *pAttr ), + mpDocShell ( pDocSh ) { SvxColorTableItem aColorTableItem(*( (const SvxColorTableItem*) ( mpDocShell->GetItem( SID_COLOR_TABLE ) ) ) ); diff --git a/sd/source/ui/dlg/dlgpage.src b/sd/source/ui/dlg/dlgpage.src index ea0c0e024f05..5cd4337995cf 100644 --- a/sd/source/ui/dlg/dlgpage.src +++ b/sd/source/ui/dlg/dlgpage.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/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx index 6cd220d5a5bc..938341dd029e 100755 --- a/sd/source/ui/dlg/dlgsnap.cxx +++ b/sd/source/ui/dlg/dlgsnap.cxx @@ -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 @@ -53,9 +53,9 @@ \************************************************************************/ SdSnapLineDlg::SdSnapLineDlg( - ::Window* pWindow, + ::Window* pWindow, const SfxItemSet& rInAttrs, - ::sd::View* pView) + ::sd::View* pView) : ModalDialog (pWindow, SdResId(DLG_SNAPLINE)), aFlPos (this, SdResId(FL_POSITION)), aFtX (this, SdResId(FT_X)), @@ -97,7 +97,7 @@ SdSnapLineDlg::SdSnapLineDlg( SfxMapUnit ePoolUnit = pPool->GetMetric( SID_ATTR_FILL_HATCH ); // #i48497# Consider page origin - SdrPageView* pPV = pView->GetSdrPageView(); + SdrPageView* pPV = pView->GetSdrPageView(); Point aLeftTop(aWorkArea.Left()+1, aWorkArea.Top()+1); pPV->LogicToPagePos(aLeftTop); Point aRightBottom(aWorkArea.Right()-2, aWorkArea.Bottom()-2); @@ -149,9 +149,9 @@ SdSnapLineDlg::SdSnapLineDlg( IMPL_LINK( SdSnapLineDlg, ClickHdl, Button *, pBtn ) { - if ( pBtn == &aRbPoint ) SetInputFields(TRUE, TRUE); - else if ( pBtn == &aRbHorz ) SetInputFields(FALSE, TRUE); - else if ( pBtn == &aRbVert ) SetInputFields(TRUE, FALSE); + if ( pBtn == &aRbPoint ) SetInputFields(TRUE, TRUE); + else if ( pBtn == &aRbHorz ) SetInputFields(FALSE, TRUE); + else if ( pBtn == &aRbVert ) SetInputFields(TRUE, FALSE); else if ( pBtn == &aBtnDelete ) EndDialog(RET_SNAP_DELETE); return 0; @@ -167,9 +167,9 @@ void SdSnapLineDlg::GetAttr(SfxItemSet& rOutAttrs) { SnapKind eKind; - if ( aRbHorz.IsChecked() ) eKind = SK_HORIZONTAL; + if ( aRbHorz.IsChecked() ) eKind = SK_HORIZONTAL; else if ( aRbVert.IsChecked() ) eKind = SK_VERTICAL; - else eKind = SK_POINT; + else eKind = SK_POINT; nXValue = Fraction( GetCoreValue( aMtrFldX, SFX_MAPUNIT_100TH_MM) ) * aUIScale; nYValue = Fraction( GetCoreValue( aMtrFldY, SFX_MAPUNIT_100TH_MM) ) * aUIScale; diff --git a/sd/source/ui/dlg/dlgsnap.src b/sd/source/ui/dlg/dlgsnap.src index 631034dd5879..43bdb414e63e 100644 --- a/sd/source/ui/dlg/dlgsnap.src +++ b/sd/source/ui/dlg/dlgsnap.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/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index a42ce43a2c6d..09815503115a 100755 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -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 @@ -144,8 +144,8 @@ void SdDocPreviewWin::Paint( const Rectangle& rRect ) { SvtAccessibilityOptions aAccOptions; bool bUseContrast = aAccOptions.GetIsForPagePreviews() && Application::GetSettings().GetStyleSettings().GetHighContrastMode(); - SetDrawMode( bUseContrast - ? ::sd::ViewShell::OUTPUT_DRAWMODE_CONTRAST + SetDrawMode( bUseContrast + ? ::sd::ViewShell::OUTPUT_DRAWMODE_CONTRAST : ::sd::ViewShell::OUTPUT_DRAWMODE_COLOR ); ImpPaint( pMetaFile, (VirtualDevice*)this ); @@ -171,7 +171,7 @@ void SdDocPreviewWin::startPreview() { if( !mxSlideShow.is() ) mxSlideShow = sd::SlideShow::Create( pDoc ); - + Reference< XDrawPage > xDrawPage( pPage->getUnoPage(), UNO_QUERY ); Reference< XAnimationNode > xAnimationNode; @@ -230,10 +230,10 @@ void SdDocPreviewWin::updateViewSettings() pMtf = new GDIMetaFile; - VirtualDevice aVDev; + VirtualDevice aVDev; - const Fraction aFrac( pDoc->GetScaleFraction() ); - const MapMode aMap( pDoc->GetScaleUnit(), Point(), aFrac, aFrac ); + const Fraction aFrac( pDoc->GetScaleFraction() ); + const MapMode aMap( pDoc->GetScaleUnit(), Point(), aFrac, aFrac ); aVDev.SetMapMode( aMap ); @@ -251,11 +251,11 @@ void SdDocPreviewWin::updateViewSettings() pView->SetPageVisible( FALSE ); pView->ShowSdrPage( pPage ); - const Point aNewOrg( pPage->GetLftBorder(), pPage->GetUppBorder() ); + const Point aNewOrg( pPage->GetLftBorder(), pPage->GetUppBorder() ); const Size aNewSize( aSize.Width() - pPage->GetLftBorder() - pPage->GetRgtBorder(), aSize.Height() - pPage->GetUppBorder() - pPage->GetLwrBorder() ); const Rectangle aClipRect( aNewOrg, aNewSize ); - MapMode aVMap( aMap ); + MapMode aVMap( aMap ); aVDev.Push(); aVMap.SetOrigin( Point( -aNewOrg.X(), -aNewOrg.Y() ) ); diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index 71fad02f24a7..1acdb9a8250f 100755 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx @@ -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 @@ -60,7 +60,7 @@ namespace css = ::com::sun::star; // -------------------------------------------------------------------- -// ----------- SdFileDialog_Imp --------------------------- +// ----------- SdFileDialog_Imp --------------------------- // -------------------------------------------------------------------- class SdFileDialog_Imp : public sfx2::FileDialogHelper { @@ -71,29 +71,29 @@ private: friend class SdOpenSoundFileDialog; - css::uno::Reference< css::ui::dialogs::XFilePickerControlAccess > mxControlAccess; + css::uno::Reference< css::ui::dialogs::XFilePickerControlAccess > mxControlAccess; css::uno::Reference< css::media::XPlayer > mxPlayer; ULONG mnPlaySoundEvent; - BOOL mbUsableSelection; - BOOL mbLabelPlaying; - - void CheckSelectionState(); + BOOL mbUsableSelection; + BOOL mbLabelPlaying; + void CheckSelectionState(); + DECL_LINK( PlayMusicHdl, void * ); Timer maUpdateTimer; DECL_LINK( IsMusicStoppedHdl, void * ); - + public: - SdFileDialog_Imp( const short nDialogType, sal_Bool bUsableSelection ); + SdFileDialog_Imp( const short nDialogType, sal_Bool bUsableSelection ); ~SdFileDialog_Imp(); - ErrCode Execute(); + ErrCode Execute(); // overwritten from FileDialogHelper, to receive user feedback - virtual void SAL_CALL ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent ); + virtual void SAL_CALL ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent ); }; // ------------------------------------------------------------------------ @@ -101,7 +101,7 @@ void SAL_CALL SdFileDialog_Imp::ControlStateChanged( const css::ui::dialogs::Fil { ::vos::OGuard aGuard( Application::GetSolarMutex() ); - switch( aEvent.ElementId ) + switch( aEvent.ElementId ) { case css::ui::dialogs::CommonFilePickerElementIds::LISTBOX_FILTER: CheckSelectionState(); @@ -110,7 +110,7 @@ void SAL_CALL SdFileDialog_Imp::ControlStateChanged( const css::ui::dialogs::Fil case css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY: if( mxControlAccess.is() ) { - if( mnPlaySoundEvent ) + if( mnPlaySoundEvent ) Application::RemoveUserEvent( mnPlaySoundEvent ); mnPlaySoundEvent = Application::PostUserEvent( LINK( this, SdFileDialog_Imp, PlayMusicHdl ) ); @@ -126,7 +126,7 @@ IMPL_LINK( SdFileDialog_Imp, PlayMusicHdl, void *, EMPTYARG ) mnPlaySoundEvent = 0; if (mxPlayer.is()) - { + { if (mxPlayer->isPlaying()) mxPlayer->stop(); mxPlayer.clear(); @@ -136,9 +136,9 @@ IMPL_LINK( SdFileDialog_Imp, PlayMusicHdl, void *, EMPTYARG ) { try { - mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY, + mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY, String( SdResId( STR_PLAY ) ) ); - + mbLabelPlaying = FALSE; } catch( css::lang::IllegalArgumentException ) @@ -170,9 +170,9 @@ IMPL_LINK( SdFileDialog_Imp, PlayMusicHdl, void *, EMPTYARG ) { try { - mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY, + mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY, String( SdResId( STR_STOP ) ) ); - + mbLabelPlaying = TRUE; } catch( css::lang::IllegalArgumentException ) @@ -194,7 +194,7 @@ IMPL_LINK( SdFileDialog_Imp, IsMusicStoppedHdl, void *, EMPTYARG ) ::vos::OGuard aGuard( Application::GetSolarMutex() ); if ( - mxPlayer.is() && mxPlayer->isPlaying() && + mxPlayer.is() && mxPlayer->isPlaying() && mxPlayer->getMediaTime() < mxPlayer->getDuration() ) { @@ -207,7 +207,7 @@ IMPL_LINK( SdFileDialog_Imp, IsMusicStoppedHdl, void *, EMPTYARG ) { try { - mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY, + mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY, String( SdResId( STR_PLAY ) ) ); mbLabelPlaying = FALSE; } @@ -227,7 +227,7 @@ void SdFileDialog_Imp::CheckSelectionState() { if( mbUsableSelection && mxControlAccess.is() ) { - String aCurrFilter( GetCurrentFilter() ); + String aCurrFilter( GetCurrentFilter() ); try { @@ -246,8 +246,8 @@ void SdFileDialog_Imp::CheckSelectionState() } //----------------------------------------------------------------------------- -SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType, - sal_Bool bUsableSelection ) : +SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType, + sal_Bool bUsableSelection ) : FileDialogHelper( nDialogType, 0 ), mnPlaySoundEvent( 0 ), mbUsableSelection( bUsableSelection ), @@ -267,7 +267,7 @@ SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType, { try { - mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY, + mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY, String( SdResId( STR_PLAY ) ) ); } catch( css::lang::IllegalArgumentException ) @@ -297,21 +297,21 @@ SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType, // ------------------------------------------------------------------------ SdFileDialog_Imp::~SdFileDialog_Imp() { - if( mnPlaySoundEvent ) + if( mnPlaySoundEvent ) Application::RemoveUserEvent( mnPlaySoundEvent ); } // ------------------------------------------------------------------------ ErrCode SdFileDialog_Imp::Execute() { - // make sure selection checkbox is disabled if + // make sure selection checkbox is disabled if // HTML is current filter! CheckSelectionState(); return FileDialogHelper::Execute(); } // -------------------------------------------------------------------- -// ----------- SdOpenSoundFileDialog ----------------------- +// ----------- SdOpenSoundFileDialog ----------------------- // -------------------------------------------------------------------- // these are simple forwarders diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx index 5a23262c57c0..0355c91d67d6 100644 --- a/sd/source/ui/dlg/gluectrl.cxx +++ b/sd/source/ui/dlg/gluectrl.cxx @@ -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 @@ -57,13 +57,13 @@ static UINT16 aEscDirArray[] = SDRESC_RIGHT, SDRESC_TOP, SDRESC_BOTTOM, -// SDRESC_LO, -// SDRESC_LU, -// SDRESC_RO, -// SDRESC_RU, -// SDRESC_HORZ, -// SDRESC_VERT, -// SDRESC_ALL +// SDRESC_LO, +// SDRESC_LU, +// SDRESC_RO, +// SDRESC_RU, +// SDRESC_HORZ, +// SDRESC_VERT, +// SDRESC_ALL }; @@ -91,7 +91,7 @@ GlueEscDirLB::GlueEscDirLB( Window* pParent, const Reference< XFrame >& rFrame ) /************************************************************************* |* -|* Dtor +|* Dtor |* \************************************************************************/ @@ -157,7 +157,7 @@ void GlueEscDirLB::Fill() |* \************************************************************************/ -SdTbxCtlGlueEscDir::SdTbxCtlGlueEscDir( +SdTbxCtlGlueEscDir::SdTbxCtlGlueEscDir( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index b48a1682bba6..c2a371e39420 100755 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -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 @@ -88,7 +88,7 @@ namespace sd class PresLayoutPreview : public Control { private: - SdPage* mpMaster; + SdPage* mpMaster; HeaderFooterSettings maSettings; Size maPageSize; Rectangle maOutRect; @@ -135,45 +135,45 @@ int nDateTimeFormats[nDateTimeFormatsCount] = class HeaderFooterTabPage : public TabPage { private: - FixedLine maFLIncludeOnPage; + FixedLine maFLIncludeOnPage; - CheckBox maCBHeader; - FixedText maFTHeader; - Edit maTBHeader; + CheckBox maCBHeader; + FixedText maFTHeader; + Edit maTBHeader; - FixedLine maFLDateTime; - CheckBox maCBDateTime; - RadioButton maRBDateTimeFixed; + FixedLine maFLDateTime; + CheckBox maCBDateTime; + RadioButton maRBDateTimeFixed; RadioButton maRBDateTimeAutomatic; - Edit maTBDateTimeFixed; - ListBox maCBDateTimeFormat; - FixedText maFTDateTimeLanguage; - SvxLanguageBox maCBDateTimeLanguage; + Edit maTBDateTimeFixed; + ListBox maCBDateTimeFormat; + FixedText maFTDateTimeLanguage; + SvxLanguageBox maCBDateTimeLanguage; - FixedLine maFLFooter; - CheckBox maCBFooter; - FixedText maFTFooter; - Edit maTBFooter; + FixedLine maFLFooter; + CheckBox maCBFooter; + FixedText maFTFooter; + Edit maTBFooter; - FixedLine maFLSlideNumber; - CheckBox maCBSlideNumber; + FixedLine maFLSlideNumber; + CheckBox maCBSlideNumber; - FixedLine maFLNotOnTitle; - CheckBox maCBNotOnTitle; + FixedLine maFLNotOnTitle; + CheckBox maCBNotOnTitle; - PushButton maPBApplyToAll; - PushButton maPBApply; - CancelButton maPBCancel; - HelpButton maPBHelp; + PushButton maPBApplyToAll; + PushButton maPBApply; + CancelButton maPBCancel; + HelpButton maPBHelp; - PresLayoutPreview maCTPreview; + PresLayoutPreview maCTPreview; - SdPage* mpCurrentPage; - SdDrawDocument * mpDoc; + SdPage* mpCurrentPage; + SdDrawDocument * mpDoc; HeaderFooterDialog* mpDialog; - LanguageType meOldLanguage; + LanguageType meOldLanguage; - bool mbHandoutMode; + bool mbHandoutMode; DECL_LINK( UpdateOnClickHdl, void * ); @@ -192,11 +192,11 @@ public: ~HeaderFooterTabPage(); static SfxTabPage* Create( ::Window*, const SfxItemSet& ); - static USHORT* GetRanges(); + static USHORT* GetRanges(); - void init( const HeaderFooterSettings& rSettings, bool bNotOnTitle, bool bHasApply ); - void getData( HeaderFooterSettings& rSettings, bool& rNotOnTitle ); - void update(); + void init( const HeaderFooterSettings& rSettings, bool bNotOnTitle, bool bHasApply ); + void getData( HeaderFooterSettings& rSettings, bool& rNotOnTitle ); + void update(); }; } @@ -236,7 +236,7 @@ HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent mpCurrentPage = NULL; } -// maTabCtrl.SetHelpId( HID_XML_FILTER_TABPAGE_CTRL ); +// maTabCtrl.SetHelpId( HID_XML_FILTER_TABPAGE_CTRL ); maTabCtrl.Show(); mpSlideTabPage = new HeaderFooterTabPage( this, &maTabCtrl, pDoc, pSlide, false ); diff --git a/sd/source/ui/dlg/headerfooterdlg.src b/sd/source/ui/dlg/headerfooterdlg.src index df42ff9b7551..b2e4fb25c870 100644 --- a/sd/source/ui/dlg/headerfooterdlg.src +++ b/sd/source/ui/dlg/headerfooterdlg.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,11 +29,11 @@ #include "dialogs.hrc" #include "headerfooterdlg.hrc" -#define TAB_WIDTH 290 -#define TAB_HEIGHT 186 +#define TAB_WIDTH 290 +#define TAB_HEIGHT 186 -#define DLG_WIDTH TAB_WIDTH + 6 -#define DLG_HEIGHT TAB_HEIGHT + 6 +#define DLG_WIDTH TAB_WIDTH + 6 +#define DLG_HEIGHT TAB_HEIGHT + 6 TabDialog RID_SD_DLG_HEADERFOOTER { @@ -68,38 +68,38 @@ TabDialog RID_SD_DLG_HEADERFOOTER }; }; -#define SPACE_Y 3 -#define SPACE_X 3 +#define SPACE_Y 3 +#define SPACE_X 3 -#define C1 (RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) +#define C1 (RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) #define C2 (RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + RSC_SP_CHK_TEXTINDENT) -#define C3 (RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + 2 * RSC_SP_CHK_TEXTINDENT) -#define W1 (TAB_WIDTH - PUSHBUTTON_WIDTH - 10 * SPACE_X) -#define W2 (60) -#define W3 (W1 - C2 - W2 - SPACE_X) -#define W4 ((W1 - C3 - SPACE_X) / 2) +#define C3 (RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + 2 * RSC_SP_CHK_TEXTINDENT) +#define W1 (TAB_WIDTH - PUSHBUTTON_WIDTH - 10 * SPACE_X) +#define W2 (60) +#define W3 (W1 - C2 - W2 - SPACE_X) +#define W4 ((W1 - C3 - SPACE_X) / 2) -#define C4 (C2 + W2 + SPACE_X) +#define C4 (C2 + W2 + SPACE_X) -#define PUSHBUTTON_WIDTH 80 +#define PUSHBUTTON_WIDTH 80 TabPage RID_SD_TABPAGE_HEADERFOOTER { -// HelpID = SID_ANIMATION_EFFECTS ; +// HelpID = SID_ANIMATION_EFFECTS ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( TAB_WIDTH , TAB_HEIGHT ) ; Hide = TRUE; -#define Y0 (RSC_SP_TBPG_INNERBORDER_TOP ) - +#define Y0 (RSC_SP_TBPG_INNERBORDER_TOP ) + FixedLine FL_INCLUDE_ON_PAGE { Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT, Y0 ) ; Size = MAP_APPFONT ( W1 - RSC_SP_TBPG_INNERBORDER_LEFT , RSC_CD_FIXEDLINE_HEIGHT ) ; Text [ en-US ] = "Include on slide"; - }; - -#define Y1 (Y0 + RSC_CD_FIXEDLINE_HEIGHT + SPACE_Y) + }; + +#define Y1 (Y0 + RSC_CD_FIXEDLINE_HEIGHT + SPACE_Y) CheckBox CB_HEADER { @@ -108,7 +108,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER TabStop = TRUE ; Text [ en-US ] = "Header"; }; - + FixedText FT_HEADER { Pos = MAP_APPFONT ( C2, Y1 + SPACE_Y + RSC_CD_CHECKBOX_HEIGHT + 1 ); @@ -116,7 +116,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER TabStop = TRUE ; Text [ en-US ] = "Header text"; }; - + Edit TB_HEADER_FIXED { Pos = MAP_APPFONT ( C4, Y1 + SPACE_Y + RSC_CD_CHECKBOX_HEIGHT ); @@ -124,7 +124,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER TabStop = TRUE ; Border = TRUE ; }; - + #define Y2 (Y1 + 2 * SPACE_Y + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT) FixedLine FL_DATETIME @@ -140,7 +140,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER TabStop = TRUE ; Text [ en-US ] = "~Date and time"; }; - + RadioButton RB_DATETIME_FIXED { Pos = MAP_APPFONT ( C2, Y2 + 2 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + 1 ); @@ -148,31 +148,31 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER TabStop = TRUE ; Text [ en-US ] = "Fi~xed"; }; - + Edit TB_DATETIME_FIXED { Pos = MAP_APPFONT ( C4, Y2 + 2 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT ); Size = MAP_APPFONT ( W3, RSC_CD_TEXTBOX_HEIGHT ); TabStop = TRUE ; Border = TRUE ; - }; - + }; + RadioButton RB_DATETIME_AUTOMATIC { Pos = MAP_APPFONT ( C2, Y2 + 3 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT ); Size = MAP_APPFONT ( 80, RSC_CD_RADIOBUTTON_HEIGHT ); TabStop = TRUE ; - Text [ en-US ] = "~Variable"; + Text [ en-US ] = "~Variable"; }; - + ListBox CB_DATETIME_FORMAT { Pos = MAP_APPFONT ( C3, Y2 + 4 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT + RSC_CD_RADIOBUTTON_HEIGHT ); Size = MAP_APPFONT ( W4, 80 ); TabStop = TRUE ; DropDown = TRUE ; - }; - + }; + FixedText FT_DATETIME_LANGUAGE { Pos = MAP_APPFONT ( C3 + W4 + SPACE_X, Y2 + 3 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT + 1 ); @@ -180,23 +180,23 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER TabStop = TRUE ; Text [ en-US ] = "~Language:"; }; - + ListBox CB_DATETIME_LANGUAGE { Pos = MAP_APPFONT ( C3 + W4 + SPACE_X, Y2 + 4 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT + RSC_CD_RADIOBUTTON_HEIGHT ); Size = MAP_APPFONT ( W4, 80 ); TabStop = TRUE ; - DropDown = TRUE ; - }; - -#define Y3 (Y2 + 5 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT + RSC_CD_RADIOBUTTON_HEIGHT + RSC_CD_DROPDOWN_HEIGHT ) + DropDown = TRUE ; + }; + +#define Y3 (Y2 + 5 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT + RSC_CD_RADIOBUTTON_HEIGHT + RSC_CD_DROPDOWN_HEIGHT ) FixedLine FL_FOOTER { Pos = MAP_APPFONT ( C1, Y3 ); Size = MAP_APPFONT ( W1 - C1, RSC_CD_FIXEDLINE_HEIGHT ); }; - + CheckBox CB_FOOTER { Pos = MAP_APPFONT ( C1, Y3 + SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT ); @@ -204,7 +204,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER TabStop = TRUE ; Text [ en-US ] = "Footer"; }; - + FixedText FT_FOOTER { Pos = MAP_APPFONT ( C2, Y3 + 2 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + 1 ); @@ -212,7 +212,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER TabStop = TRUE ; Text [ en-US ] = "Footer text"; }; - + Edit TB_FOOTER_FIXED { Pos = MAP_APPFONT ( C4, Y3 + 2 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT ); @@ -221,14 +221,14 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER Border = TRUE ; }; -#define Y4 (Y3 + 3 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT ) +#define Y4 (Y3 + 3 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT ) FixedLine FL_SLIDENUMBER { Pos = MAP_APPFONT ( C1, Y4 ); Size = MAP_APPFONT ( W1 - C1, RSC_CD_FIXEDLINE_HEIGHT ); }; - + CheckBox CB_SLIDENUMBER { Pos = MAP_APPFONT ( C1, Y4 + SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT ); @@ -236,15 +236,15 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER TabStop = TRUE ; Text [ en-US ] = "Slide number"; }; - -#define Y5 (Y4 + 2 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT ) + +#define Y5 (Y4 + 2 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT ) FixedLine FL_NOTONTITLE { Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT, Y5 ) ; Size = MAP_APPFONT ( W1 - RSC_SP_TBPG_INNERBORDER_LEFT, RSC_CD_FIXEDLINE_HEIGHT ); }; - + CheckBox CB_NOTONTITLE { Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT, Y5 + SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT ); @@ -282,18 +282,18 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER Size = MAP_APPFONT ( PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); TabStop = TRUE ; }; - + Control CT_PREVIEW { Pos = MAP_APPFONT ( TAB_WIDTH - 7 * SPACE_X - PUSHBUTTON_WIDTH, TAB_HEIGHT - 6*SPACE_Y - PUSHBUTTON_WIDTH ); - Size = MAP_APPFONT ( PUSHBUTTON_WIDTH, PUSHBUTTON_WIDTH ); + Size = MAP_APPFONT ( PUSHBUTTON_WIDTH, PUSHBUTTON_WIDTH ); }; String STR_PAGE_NUMBER { Text [ en-US ] = "Page number"; }; - + String STR_INCLUDE_ON_PAGE { Text [ en-US ] = "Include on page"; diff --git a/sd/source/ui/dlg/ins_paste.cxx b/sd/source/ui/dlg/ins_paste.cxx index c0079d5eee77..12514ab4ec34 100644 --- a/sd/source/ui/dlg/ins_paste.cxx +++ b/sd/source/ui/dlg/ins_paste.cxx @@ -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/sd/source/ui/dlg/ins_paste.src b/sd/source/ui/dlg/ins_paste.src index 0b066f096f87..aec49d36b90a 100644 --- a/sd/source/ui/dlg/ins_paste.src +++ b/sd/source/ui/dlg/ins_paste.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/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx index 5d260367f383..069e74a59070 100755 --- a/sd/source/ui/dlg/inspagob.cxx +++ b/sd/source/ui/dlg/inspagob.cxx @@ -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 @@ -46,7 +46,7 @@ /************************************************************************* |* -|* Ctor +|* Ctor |* \************************************************************************/ @@ -62,9 +62,9 @@ SdInsertPagesObjsDlg::SdInsertPagesObjsDlg( aBtnOk ( this, SdResId( BTN_OK ) ), aBtnCancel ( this, SdResId( BTN_CANCEL ) ), aBtnHelp ( this, SdResId( BTN_HELP ) ), - pMedium ( pSfxMedium ), - mpDoc ( pInDoc ), - rName ( rFileName ) + pMedium ( pSfxMedium ), + mpDoc ( pInDoc ), + rName ( rFileName ) { FreeResource(); @@ -81,7 +81,7 @@ SdInsertPagesObjsDlg::SdInsertPagesObjsDlg( /************************************************************************* |* -|* Dtor +|* Dtor |* \************************************************************************/ @@ -91,8 +91,8 @@ SdInsertPagesObjsDlg::~SdInsertPagesObjsDlg() /************************************************************************* |* -|* Fuellt die TreeLB in Abhaengigkeit des Mediums. Ist kein Medium -|* vorhanden, handelt es sich um ein Text- und kein Drawdokument +|* Fuellt die TreeLB in Abhaengigkeit des Mediums. Ist kein Medium +|* vorhanden, handelt es sich um ein Text- und kein Drawdokument |* \************************************************************************/ @@ -122,9 +122,9 @@ void SdInsertPagesObjsDlg::Reset() /************************************************************************* |* -|* Liefert die Liste zurueck -|* nType == 0 -> Seiten -|* nType == 1 -> Objekte +|* Liefert die Liste zurueck +|* nType == 0 -> Seiten +|* nType == 1 -> Objekte |* \************************************************************************/ @@ -149,7 +149,7 @@ List* SdInsertPagesObjsDlg::GetList( USHORT nType ) /************************************************************************* |* -|* Ist Verknuepfung gechecked +|* Ist Verknuepfung gechecked |* \************************************************************************/ @@ -160,7 +160,7 @@ BOOL SdInsertPagesObjsDlg::IsLink() /************************************************************************* |* -|* Ist Verknuepfung gechecked +|* Ist Verknuepfung gechecked |* \************************************************************************/ diff --git a/sd/source/ui/dlg/inspagob.src b/sd/source/ui/dlg/inspagob.src index 4eae011a9ba2..b4fbaad9fe0d 100644 --- a/sd/source/ui/dlg/inspagob.src +++ b/sd/source/ui/dlg/inspagob.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/sd/source/ui/dlg/layeroptionsdlg.cxx b/sd/source/ui/dlg/layeroptionsdlg.cxx index ddfe92879188..9a5f42c71895 100644 --- a/sd/source/ui/dlg/layeroptionsdlg.cxx +++ b/sd/source/ui/dlg/layeroptionsdlg.cxx @@ -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/sd/source/ui/dlg/layeroptionsdlg.src b/sd/source/ui/dlg/layeroptionsdlg.src index cd50a810d3fd..c199107515ce 100644 --- a/sd/source/ui/dlg/layeroptionsdlg.src +++ b/sd/source/ui/dlg/layeroptionsdlg.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 @@ -107,7 +107,7 @@ ModalDialog DLG_INSERT_LAYER Text [ en-US ] = "~Locked" ; TabStop = TRUE ; }; - + // divider FixedLine FL_SEPARATOR_B { diff --git a/sd/source/ui/dlg/masterlayoutdlg.cxx b/sd/source/ui/dlg/masterlayoutdlg.cxx index 601b1d1cf72c..3930875fb4cd 100644 --- a/sd/source/ui/dlg/masterlayoutdlg.cxx +++ b/sd/source/ui/dlg/masterlayoutdlg.cxx @@ -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 @@ -49,7 +49,7 @@ using namespace ::sd; MasterLayoutDialog::MasterLayoutDialog( Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) -: ModalDialog( pParent, SdResId( RID_SD_DLG_MASTER_LAYOUT ) ), +: ModalDialog( pParent, SdResId( RID_SD_DLG_MASTER_LAYOUT ) ), mpDoc( pDoc ), mpCurrentPage( pCurrentPage ), maFLPlaceholders( this, SdResId( FL_PLACEHOLDERS ) ), @@ -75,21 +75,21 @@ MasterLayoutDialog::MasterLayoutDialog( Window* pParent, SdDrawDocument* pDoc, S { case PK_STANDARD: { - // aTitle = String( SdResId( STR_MASTER_LAYOUT_TITLE ) ); + // aTitle = String( SdResId( STR_MASTER_LAYOUT_TITLE ) ); maCBHeader.Enable( FALSE ); String aSlideNumberStr( SdResId( STR_SLIDE_NUMBER ) ); maCBPageNumber.SetText( aSlideNumberStr ); break; } case PK_NOTES: - // aTitle = String( SdResId( STR_NOTES_MASTER_LAYOUT_TITLE ) ); + // aTitle = String( SdResId( STR_NOTES_MASTER_LAYOUT_TITLE ) ); break; case PK_HANDOUT: - // aTitle = String( SdResId( STR_HANDOUT_TEMPLATE_LAYOUT_TITLE ) ); + // aTitle = String( SdResId( STR_HANDOUT_TEMPLATE_LAYOUT_TITLE ) ); break; } String aTitle (SdResId( STR_MASTER_LAYOUT_TITLE ) ); - + SetText( aTitle ); FreeResource(); @@ -151,7 +151,7 @@ void MasterLayoutDialog::applyChanges() else create( PRESOBJ_SLIDENUMBER ); } - + mpDoc->EndUndo(); } diff --git a/sd/source/ui/dlg/masterlayoutdlg.src b/sd/source/ui/dlg/masterlayoutdlg.src index 1e862b63cec6..a886555b616c 100644 --- a/sd/source/ui/dlg/masterlayoutdlg.src +++ b/sd/source/ui/dlg/masterlayoutdlg.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 @@ -51,8 +51,8 @@ ModalDialog RID_SD_DLG_MASTER_LAYOUT TabStop = TRUE; Text [ en-US ] = "Header"; - }; - + }; + CheckBox CB_DATE { Pos = MAP_APPFONT( 6, 29 ); @@ -61,7 +61,7 @@ ModalDialog RID_SD_DLG_MASTER_LAYOUT Text [ en-US ] = "Date/time"; }; - + CheckBox CB_FOOTER { Pos = MAP_APPFONT( 6, 42 ); @@ -69,7 +69,7 @@ ModalDialog RID_SD_DLG_MASTER_LAYOUT TabStop = TRUE; Text [ en-US ] = "Footer"; - }; + }; CheckBox CB_PAGE_NUMBER { @@ -93,7 +93,7 @@ ModalDialog RID_SD_DLG_MASTER_LAYOUT Size = MAP_APPFONT( 40 , 14 ); TabStop = TRUE; }; - + String STR_SLIDE_NUMBER { Text [ en-US ] = "Slide number"; diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx index 47780b0f8233..a9d34aaf94c8 100644 --- a/sd/source/ui/dlg/morphdlg.cxx +++ b/sd/source/ui/dlg/morphdlg.cxx @@ -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 @@ -53,11 +53,11 @@ namespace sd { /******************************************************************************/ -#define FADE_STEP "FadeSteps" -#define FADE_ATTRIB "FadeAttributes" -#define FADE_ORIENT "FadeOrientation" -#define FADE_TRUE "true" -#define FADE_FALSE "false" +#define FADE_STEP "FadeSteps" +#define FADE_ATTRIB "FadeAttributes" +#define FADE_ORIENT "FadeOrientation" +#define FADE_TRUE "true" +#define FADE_FALSE "false" /******************************************************************************/ @@ -83,17 +83,17 @@ MorphDlg::MorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* FreeResource(); LoadSettings(); - SfxItemPool* pPool = (SfxItemPool*) pObj1->GetObjectItemPool(); - SfxItemSet aSet1( *pPool ); - SfxItemSet aSet2( *pPool ); + SfxItemPool* pPool = (SfxItemPool*) pObj1->GetObjectItemPool(); + SfxItemSet aSet1( *pPool ); + SfxItemSet aSet2( *pPool ); aSet1.Put(pObj1->GetMergedItemSet()); aSet2.Put(pObj2->GetMergedItemSet()); - const XLineStyle eLineStyle1 = ( (const XLineStyleItem&) aSet1.Get( XATTR_LINESTYLE ) ).GetValue(); - const XLineStyle eLineStyle2 = ( (const XLineStyleItem&) aSet2.Get( XATTR_LINESTYLE ) ).GetValue(); - const XFillStyle eFillStyle1 = ( (const XFillStyleItem&) aSet1.Get( XATTR_FILLSTYLE ) ).GetValue(); - const XFillStyle eFillStyle2 = ( (const XFillStyleItem&) aSet2.Get( XATTR_FILLSTYLE ) ).GetValue(); + const XLineStyle eLineStyle1 = ( (const XLineStyleItem&) aSet1.Get( XATTR_LINESTYLE ) ).GetValue(); + const XLineStyle eLineStyle2 = ( (const XLineStyleItem&) aSet2.Get( XATTR_LINESTYLE ) ).GetValue(); + const XFillStyle eFillStyle1 = ( (const XFillStyleItem&) aSet1.Get( XATTR_FILLSTYLE ) ).GetValue(); + const XFillStyle eFillStyle2 = ( (const XFillStyleItem&) aSet2.Get( XATTR_FILLSTYLE ) ).GetValue(); if ( ( ( eLineStyle1 == XLINE_NONE ) || ( eLineStyle2 == XLINE_NONE ) ) && ( ( eFillStyle1 != XFILL_SOLID ) || ( eFillStyle2 != XFILL_SOLID ) ) ) @@ -122,11 +122,11 @@ MorphDlg::~MorphDlg() void MorphDlg::LoadSettings() { - SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream( UniString::CreateFromAscii( - RTL_CONSTASCII_STRINGPARAM( SD_OPTION_MORPHING ) ), + SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream( UniString::CreateFromAscii( + RTL_CONSTASCII_STRINGPARAM( SD_OPTION_MORPHING ) ), SD_OPTION_LOAD ) ); - UINT16 nSteps; - BOOL bOrient, bAttrib; + UINT16 nSteps; + BOOL bOrient, bAttrib; if( xIStm.Is() ) { @@ -149,8 +149,8 @@ void MorphDlg::LoadSettings() void MorphDlg::SaveSettings() const { - SvStorageStreamRef xOStm( SD_MOD()->GetOptionStream( UniString::CreateFromAscii( - RTL_CONSTASCII_STRINGPARAM( SD_OPTION_MORPHING ) ), + SvStorageStreamRef xOStm( SD_MOD()->GetOptionStream( UniString::CreateFromAscii( + RTL_CONSTASCII_STRINGPARAM( SD_OPTION_MORPHING ) ), SD_OPTION_STORE ) ); if( xOStm.Is() ) diff --git a/sd/source/ui/dlg/morphdlg.src b/sd/source/ui/dlg/morphdlg.src index 64e63a33cd59..13e82785a26e 100644 --- a/sd/source/ui/dlg/morphdlg.src +++ b/sd/source/ui/dlg/morphdlg.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/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 294aa6feb65a..1a89d954a7bf 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -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 @@ -69,7 +69,7 @@ static const sal_uInt16 nShowAllShapesFilter=2; } /************************************************************************* -|* SdNavigatorWin - FloatingWindow +|* SdNavigatorWin - FloatingWindow \************************************************************************/ SdNavigatorWin::SdNavigatorWin( @@ -77,17 +77,17 @@ SdNavigatorWin::SdNavigatorWin( ::sd::NavigatorChildWindow* pChWinCtxt, const SdResId& rSdResId, SfxBindings* pInBindings ) -: ::Window( pParent, rSdResId ) -, maToolbox ( this, SdResId( 1 ) ) -, maTlbObjects( this, SdResId( TLB_OBJECTS ) ) -, maLbDocs ( this, SdResId( LB_DOCS ) ) -, mpChildWinContext( pChWinCtxt ) -, mbDocImported ( FALSE ) +: ::Window( pParent, rSdResId ) +, maToolbox ( this, SdResId( 1 ) ) +, maTlbObjects( this, SdResId( TLB_OBJECTS ) ) +, maLbDocs ( this, SdResId( LB_DOCS ) ) +, mpChildWinContext( pChWinCtxt ) +, mbDocImported ( FALSE ) // Bei Aenderung des DragTypes: SelectionMode der TLB anpassen! -, meDragType ( NAVIGATOR_DRAGTYPE_EMBEDDED ) -, mpBindings ( pInBindings ) -, maImageList ( SdResId( IL_NAVIGATR ) ) -, maImageListH ( SdResId( ILH_NAVIGATR ) ) +, meDragType ( NAVIGATOR_DRAGTYPE_EMBEDDED ) +, mpBindings ( pInBindings ) +, maImageList ( SdResId( IL_NAVIGATR ) ) +, maImageListH ( SdResId( ILH_NAVIGATR ) ) { maTlbObjects.SetViewFrame( mpBindings->GetDispatcher()->GetFrame() ); @@ -109,7 +109,7 @@ SdNavigatorWin::SdNavigatorWin( // Shape filter drop down menu. maToolbox.SetItemBits(TBI_SHAPE_FILTER, maToolbox.GetItemBits(TBI_SHAPE_FILTER) | TIB_DROPDOWNONLY); - + // TreeListBox // set position below toolbox long nListboxYPos = maToolbox.GetPosPixel().Y() + maToolbox.GetSizePixel().Height() + 4; @@ -187,7 +187,7 @@ void SdNavigatorWin::InitTreeLB( const SdDrawDocument* pDoc ) maToolbox.EnableItem(TBI_SHAPE_FILTER, FALSE); else maToolbox.EnableItem(TBI_SHAPE_FILTER); - + if( !maTlbObjects.IsEqualToDoc( pDoc ) ) { String aDocName = pDocShell->GetMedium()->GetName(); @@ -203,7 +203,7 @@ void SdNavigatorWin::InitTreeLB( const SdDrawDocument* pDoc ) maLbDocs.SelectEntry( aDocShName ); // auskommentiert um 30246 zu fixen -// if( maLbDocs.GetSelectEntryCount() == 0 ) +// if( maLbDocs.GetSelectEntryCount() == 0 ) { RefreshDocumentLB(); maLbDocs.SelectEntry( aDocShName ); @@ -340,7 +340,7 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox ) //pBox->Invalidate(); } break; - + case TBI_SHAPE_FILTER: { PopupMenu *pMenu = new PopupMenu; @@ -534,7 +534,7 @@ IMPL_LINK( SdNavigatorWin, ShapeFilterCallback, Menu *, pMenu ) } } } - + return 0; } @@ -580,8 +580,8 @@ void SdNavigatorWin::Resize() BOOL SdNavigatorWin::InsertFile(const String& rFileName) { - INetURLObject aURL( rFileName ); - BOOL bReturn = TRUE; + INetURLObject aURL( rFileName ); + BOOL bReturn = TRUE; if( aURL.GetProtocol() == INET_PROT_NOT_VALID ) { @@ -622,7 +622,7 @@ BOOL SdNavigatorWin::InsertFile(const String& rFileName) // ersteinmal nachgeschaut, ob es einen Storage enthaelt SfxMedium* pMedium = new SfxMedium( aFileName, STREAM_READ | STREAM_NOCREATE, - TRUE); // Download + TRUE); // Download if (pMedium->IsStorage()) { @@ -778,7 +778,7 @@ NavDocInfo* SdNavigatorWin::GetDocInfo() long SdNavigatorWin::Notify(NotifyEvent& rNEvt) { const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); - long nOK = FALSE; + long nOK = FALSE; if( pKEvt ) { @@ -879,7 +879,7 @@ void SdNavigatorWin::ApplyImageList() SdNavigatorControllerItem::SdNavigatorControllerItem( USHORT _nId, SdNavigatorWin* pNavWin, - SfxBindings* _pBindings) : + SfxBindings* _pBindings) : SfxControllerItem( _nId, *_pBindings ), pNavigatorWin( pNavWin ) { @@ -965,7 +965,7 @@ void SdNavigatorControllerItem::StateChanged( USHORT nSId, SdPageNameControllerItem::SdPageNameControllerItem( USHORT _nId, SdNavigatorWin* pNavWin, - SfxBindings* _pBindings) : + SfxBindings* _pBindings) : SfxControllerItem( _nId, *_pBindings ), pNavigatorWin( pNavWin ) { diff --git a/sd/source/ui/dlg/navigatr.src b/sd/source/ui/dlg/navigatr.src index 4d4499d3226d..5592d086065c 100644 --- a/sd/source/ui/dlg/navigatr.src +++ b/sd/source/ui/dlg/navigatr.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 @@ -133,12 +133,12 @@ Window FLT_NAVIGATOR #define NAVIGATR_IDLIST \ IdList = \ { \ - TBI_PEN ; \ - TBI_FIRST ; \ - TBI_PREVIOUS ; \ - TBI_NEXT ; \ - TBI_LAST ; \ - TBI_EMBEDDED ; \ + TBI_PEN ; \ + TBI_FIRST ; \ + TBI_PREVIOUS ; \ + TBI_NEXT ; \ + TBI_LAST ; \ + TBI_EMBEDDED ; \ TBI_LINK ; \ TBI_HYPERLINK ; \ }; \ @@ -154,7 +154,7 @@ Window FLT_NAVIGATOR }; ImageList ILH_NAVIGATR { - Prefix = "nvh"; + Prefix = "nvh"; MaskColor = IMAGE_STDBTN_COLOR ; NAVIGATR_IDLIST }; diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index e407efc5d443..a3f81f2ae22c 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -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 @@ -55,16 +55,16 @@ public: SdParagraphNumTabPage(Window* pParent, const SfxItemSet& rSet ); ~SdParagraphNumTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); private: - TriStateBox maNewStartCB; + TriStateBox maNewStartCB; TriStateBox maNewStartNumberCB; - NumericField maNewStartNF; + NumericField maNewStartNF; bool mbModified; DECL_LINK( ImplNewStartHdl, CheckBox* ); diff --git a/sd/source/ui/dlg/paragr.src b/sd/source/ui/dlg/paragr.src index 041a4524a705..2db4939726e3 100644 --- a/sd/source/ui/dlg/paragr.src +++ b/sd/source/ui/dlg/paragr.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 @@ -62,7 +62,7 @@ TabDialog TAB_PARAGRAPH PageResID = RID_SVXPAGE_PARA_ASIAN ; Text [ en-US ] = "Asian Typography"; }; - PageItem + PageItem { Identifier = RID_TABPAGE_PARA_NUMBERING; Text = "Numbering"; diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index 473d2f4b452b..8de4cb7a4a3a 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -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 @@ -63,12 +63,12 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow, aLbDias ( this, SdResId( LB_DIAS ) ), aLbCustomshow ( this, SdResId( LB_CUSTOMSHOW ) ), - aGrpKind ( this, SdResId( GRP_KIND ) ), - aRbtStandard ( this, SdResId( RBT_STANDARD ) ), - aRbtWindow ( this, SdResId( RBT_WINDOW ) ), - aRbtAuto ( this, SdResId( RBT_AUTO ) ), - aTmfPause ( this, SdResId( TMF_PAUSE ) ), - aCbxAutoLogo ( this, SdResId( CBX_AUTOLOGO ) ), + aGrpKind ( this, SdResId( GRP_KIND ) ), + aRbtStandard ( this, SdResId( RBT_STANDARD ) ), + aRbtWindow ( this, SdResId( RBT_WINDOW ) ), + aRbtAuto ( this, SdResId( RBT_AUTO ) ), + aTmfPause ( this, SdResId( TMF_PAUSE ) ), + aCbxAutoLogo ( this, SdResId( CBX_AUTOLOGO ) ), aGrpOptions ( this, SdResId( GRP_OPTIONS ) ), aCbxManuel ( this, SdResId( CBX_MANUEL ) ), @@ -79,17 +79,17 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow, aCbxChangePage ( this, SdResId( CBX_CHANGE_PAGE ) ), aCbxAlwaysOnTop ( this, SdResId( CBX_ALWAYS_ON_TOP ) ), - maGrpMonitor ( this, SdResId( GRP_MONITOR ) ), - maFtMonitor ( this, SdResId( FT_MONITOR ) ), - maLBMonitor ( this, SdResId( LB_MONITOR ) ), + maGrpMonitor ( this, SdResId( GRP_MONITOR ) ), + maFtMonitor ( this, SdResId( FT_MONITOR ) ), + maLBMonitor ( this, SdResId( LB_MONITOR ) ), aBtnOK ( this, SdResId( BTN_OK ) ), aBtnCancel ( this, SdResId( BTN_CANCEL ) ), aBtnHelp ( this, SdResId( BTN_HELP ) ), - pCustomShowList ( pCSList ), + pCustomShowList ( pCSList ), rOutAttrs ( rInAttrs ), - mnMonitors ( 0 ), + mnMonitors ( 0 ), msPrimaryMonitor( SdResId(STR_PRIMARY_MONITOR ) ), msMonitor( SdResId( STR_MONITOR ) ), @@ -154,9 +154,9 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow, aCbxChangePage.Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_CHANGE_PAGE ) ).GetValue() ); aCbxAlwaysOnTop.Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_ALWAYS_ON_TOP ) ).GetValue() ); - const BOOL bEndless = ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_ENDLESS ) ).GetValue(); - const BOOL bWindow = !( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_FULLSCREEN ) ).GetValue(); - const long nPause = ( ( const SfxUInt32Item& ) rOutAttrs.Get( ATTR_PRESENT_PAUSE_TIMEOUT ) ).GetValue(); + const BOOL bEndless = ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_ENDLESS ) ).GetValue(); + const BOOL bWindow = !( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_FULLSCREEN ) ).GetValue(); + const long nPause = ( ( const SfxUInt32Item& ) rOutAttrs.Get( ATTR_PRESENT_PAUSE_TIMEOUT ) ).GetValue(); aTmfPause.SetTime( Time( 0, 0, nPause ) ); // set cursor in timefield @@ -223,7 +223,7 @@ void SdStartPresentationDlg::InitMonitorSettings() maLBMonitor.InsertEntry( aName ); } - if( !bMultiscreen ) + if( !bMultiscreen ) maLBMonitor.InsertEntry( msAllMonitors ); sal_Int32 nSelected = ( ( const SfxInt32Item& ) rOutAttrs.Get( ATTR_PRESENT_DISPLAY ) ).GetValue(); diff --git a/sd/source/ui/dlg/present.src b/sd/source/ui/dlg/present.src index 830e320ca4ba..bdf5b12ecd77 100644 --- a/sd/source/ui/dlg/present.src +++ b/sd/source/ui/dlg/present.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,8 +28,8 @@ #include <svx/svxids.hrc> #include "present.hrc" -#define DISTANCE 23 -#define DISTANCE2 ((DISTANCE) + 81) +#define DISTANCE 23 +#define DISTANCE2 ((DISTANCE) + 81) ModalDialog DLG_START_PRESENTATION { @@ -229,7 +229,7 @@ ModalDialog DLG_START_PRESENTATION TabStop = TRUE ; Text [ en-US ] = "Presentation always ~on top" ; }; - + FixedLine GRP_MONITOR { Pos = MAP_APPFONT ( 6, 174 ) ; @@ -258,12 +258,12 @@ ModalDialog DLG_START_PRESENTATION DropDown = TRUE ; ClipChildren = TRUE; }; - + String STR_PRIMARY_MONITOR { Text [ en-US ] = "Display %1 (primary)"; }; - + String STR_MONITOR { Text [ en-US ] = "Display %1"; diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index 98667c3362cf..e40008e570eb 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -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 @@ -74,12 +74,12 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, SfxStyleSheetBase& rStyleBase, PresentationObjects _ePO, SfxStyleSheetBasePool* pSSPool ) : - SfxTabDialog ( pParent, DlgId ), - mpDocShell ( pDocSh ), - ePO ( _ePO ), - aInputSet ( *rStyleBase.GetItemSet().GetPool(), SID_PARAM_NUM_PRESET, SID_PARAM_CUR_NUM_LEVEL ), - pOutSet ( NULL ), - pOrgSet ( &rStyleBase.GetItemSet() ) + SfxTabDialog ( pParent, DlgId ), + mpDocShell ( pDocSh ), + ePO ( _ePO ), + aInputSet ( *rStyleBase.GetItemSet().GetPool(), SID_PARAM_NUM_PRESET, SID_PARAM_CUR_NUM_LEVEL ), + pOutSet ( NULL ), + pOrgSet ( &rStyleBase.GetItemSet() ) { if( IS_OUTLINE(ePO)) { @@ -171,7 +171,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, AddTabPage( RID_SVXPAGE_PICK_BULLET ); AddTabPage( RID_SVXPAGE_PICK_SINGLE_NUM ); AddTabPage( RID_SVXPAGE_PICK_BMP ); - AddTabPage( RID_SVXPAGE_NUM_OPTIONS ); + AddTabPage( RID_SVXPAGE_NUM_OPTIONS ); AddTabPage( RID_SVXPAGE_TABULATOR ); } break; @@ -256,7 +256,7 @@ SdPresLayoutTemplateDlg::~SdPresLayoutTemplateDlg() // ----------------------------------------------------------------------- void SdPresLayoutTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) -{ SfxAllItemSet aSet(*(aInputSet.GetPool())); +{ SfxAllItemSet aSet(*(aInputSet.GetPool())); switch( nId ) { case RID_SVXPAGE_LINE: diff --git a/sd/source/ui/dlg/prltempl.src b/sd/source/ui/dlg/prltempl.src index d7251c084c3d..02ad8b373162 100644 --- a/sd/source/ui/dlg/prltempl.src +++ b/sd/source/ui/dlg/prltempl.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 @@ -112,7 +112,7 @@ TabDialog TAB_PRES_LAYOUT_TEMPLATE Identifier = RID_SVXPAGE_NUM_OPTIONS ; PageResID = RID_SVXPAGE_NUM_OPTIONS ; Text [ en-US ] = "Customize" ; - }; + }; PageItem { Identifier = RID_SVXPAGE_ALIGN_PARAGRAPH ; @@ -124,13 +124,13 @@ TabDialog TAB_PRES_LAYOUT_TEMPLATE Identifier = RID_SVXPAGE_PARA_ASIAN ; PageResID = RID_SVXPAGE_PARA_ASIAN ; Text[ en-US ] = "Asian Typography"; - }; + }; PageItem { Identifier = RID_SVXPAGE_TABULATOR ; PageResID = RID_SVXPAGE_TABULATOR ; Text [ en-US ] = "Tabs" ; - }; + }; }; }; }; diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index 3c9aad38c332..56f67da928ca 100755 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -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 @@ -44,7 +44,7 @@ /************************************************************************* |* -|* Dialog zum Aendern der Print-Optionen +|* Dialog zum Aendern der Print-Optionen |* \************************************************************************/ @@ -80,7 +80,7 @@ SdPrintOptions::SdPrintOptions( Window* pParent, const SfxItemSet& rInAttrs ) : aCbxPaperbin ( this, SdResId( CBX_PAPERBIN ) ), - rOutAttrs ( rInAttrs ) + rOutAttrs ( rInAttrs ) { FreeResource(); @@ -181,7 +181,7 @@ void SdPrintOptions::Reset( const SfxItemSet& rAttrs ) aRbtBooklet.Check( pPrintOpts->GetOptionsPrint().IsBooklet() ); aCbxFront.Check( pPrintOpts->GetOptionsPrint().IsFrontPage() ); aCbxBack.Check( pPrintOpts->GetOptionsPrint().IsBackPage() ); - aCbxPaperbin.Check( pPrintOpts->GetOptionsPrint().IsPaperbin() ); + aCbxPaperbin.Check( pPrintOpts->GetOptionsPrint().IsPaperbin() ); if( !aRbtPagesize.IsChecked() && !aRbtPagetile.IsChecked() && @@ -290,8 +290,8 @@ void SdPrintOptions::SetDrawMode() } } -void SdPrintOptions::PageCreated (SfxAllItemSet -#ifdef QUARTZ +void SdPrintOptions::PageCreated (SfxAllItemSet +#ifdef QUARTZ aSet #endif ) diff --git a/sd/source/ui/dlg/prntopts.src b/sd/source/ui/dlg/prntopts.src index dd2ed2e3f63b..2644d6e59fc9 100644 --- a/sd/source/ui/dlg/prntopts.src +++ b/sd/source/ui/dlg/prntopts.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/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx index c177d7e7eec9..f0c6d816a885 100644 --- a/sd/source/ui/dlg/sdabstdlg.cxx +++ b/sd/source/ui/dlg/sdabstdlg.cxx @@ -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/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index aa0bb5ce9f27..9f746cd38707 100755 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -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 @@ -232,7 +232,7 @@ SvxFieldData* AbstractSdModifyFieldDlg_Impl::GetField() { return pDlg->GetField(); } -SfxItemSet AbstractSdModifyFieldDlg_Impl::GetItemSet() +SfxItemSet AbstractSdModifyFieldDlg_Impl::GetItemSet() { return pDlg->GetItemSet(); } @@ -243,7 +243,7 @@ void AbstractSdSnapLineDlg_Impl::GetAttr(SfxItemSet& rOutAttrs) { pDlg->GetAttr(rOutAttrs); } -void AbstractSdSnapLineDlg_Impl::HideRadioGroup() +void AbstractSdSnapLineDlg_Impl::HideRadioGroup() { pDlg->HideRadioGroup(); } @@ -381,11 +381,11 @@ void AbstractHeaderFooterDialog_Impl::Cancel( TabPage* pPage ) //-------------- SdAbstractDialogFactory implementation-------------- //add for BreakDlg begin -VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateBreakDlg( - ::Window* pWindow, - ::sd::DrawView* pDrView, - ::sd::DrawDocShell* pShell, - ULONG nSumActionCount, +VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateBreakDlg( + ::Window* pWindow, + ::sd::DrawView* pDrView, + ::sd::DrawDocShell* pShell, + ULONG nSumActionCount, ULONG nObjCount ) //add for BreakDlg { return new VclAbstractDialog_Impl( new ::sd::BreakDlg( pWindow, pDrView, pShell, nSumActionCount, nObjCount ) ); @@ -419,7 +419,7 @@ SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabPageDialog( ::W { return new AbstractTabDialog_Impl( new SdPageDlg( pDocShell, pParent, pAttr, bAreaPage ) ); } -// add for SdCharDlg end +// add for SdCharDlg end //add for AssistentDlg begin AbstractAssistentDlg * SdAbstractDialogFactory_Impl::CreateAssistentDlg( ::Window* pParent, BOOL bAutoPilot) @@ -443,7 +443,7 @@ AbstractSdSnapLineDlg * SdAbstractDialogFactory_Impl::CreateSdSnapLineDlg( ::Win //add for SdSnapLineDlg end //add for SdInsertLayerDlg begin -AbstractSdInsertLayerDlg * SdAbstractDialogFactory_Impl::CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, String aStr ) //add for SdInsertLayerDlg +AbstractSdInsertLayerDlg * SdAbstractDialogFactory_Impl::CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, String aStr ) //add for SdInsertLayerDlg { return new AbstractSdInsertLayerDlg_Impl( new SdInsertLayerDlg( pWindow, rInAttrs, bDeletable, aStr ) ); } @@ -480,14 +480,14 @@ SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdParagraphTabDlg( : { return new AbstractTabDialog_Impl( new SdParagraphDlg( pParent, pAttr ) ); } -// add for OutlineBulletDlg end +// add for OutlineBulletDlg end // add for SdStartPresentationDlg begin AbstractSdStartPresDlg * SdAbstractDialogFactory_Impl::CreateSdStartPresentationDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, List& rPageNames, List* pCSList ) { return new AbstractSdStartPresDlg_Impl( new SdStartPresentationDlg( pWindow, rInAttrs, rPageNames, pCSList ) ); } -// add for SdStartPresentationDlg end +// add for SdStartPresentationDlg end // add for SdPresLayoutTemplateDlg begin SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) @@ -497,17 +497,17 @@ SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdPresLayoutTemplate // add for SdPresLayoutDlg begin AbstractSdPresLayoutDlg * SdAbstractDialogFactory_Impl::CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs) -{ +{ return new AbstractSdPresLayoutDlg_Impl( new SdPresLayoutDlg( pDocShell, pViewShell, pWindow, rInAttrs ) ); } -// add for SdPresLayoutDlg end +// add for SdPresLayoutDlg end // add for SdTabTemplateDlg begin SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) { return new AbstractTabDialog_Impl( new SdTabTemplateDlg( pParent, pDocShell, rStyleBase, pModel, pView ) ); } -// add for SdTabTemplateDlg end +// add for SdTabTemplateDlg end SfxAbstractDialog* SdAbstractDialogFactory_Impl::CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) { @@ -519,14 +519,14 @@ AbstractSdVectorizeDlg * SdAbstractDialogFactory_Impl::CreateSdVectorizeDlg( :: { return new AbstractSdVectorizeDlg_Impl( new SdVectorizeDlg( pParent, rBmp, pDocShell ) ); } -// add for SdVectorizeDlg end +// add for SdVectorizeDlg end // add for SdPublishingDlg begin AbstractSdPublishingDlg * SdAbstractDialogFactory_Impl::CreateSdPublishingDlg( ::Window* pWindow, DocumentType eDocType) { return new AbstractSdPublishingDlg_Impl( new SdPublishingDlg( pWindow, eDocType ) ); } -// add for SdPublishingDlg end +// add for SdPublishingDlg end // Factories for TabPages CreateTabPage SdAbstractDialogFactory_Impl::GetSdOptionsContentsTabPageCreatorFunc() @@ -549,13 +549,13 @@ CreateTabPage SdAbstractDialogFactory_Impl::GetSdOptionsSnapTabPageCreatorFunc() return SdTpOptionsSnap::Create; } -VclAbstractDialog* SdAbstractDialogFactory_Impl::CreateMasterLayoutDialog( ::Window* pParent, +VclAbstractDialog* SdAbstractDialogFactory_Impl::CreateMasterLayoutDialog( ::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) { return new VclAbstractDialog_Impl( new ::sd::MasterLayoutDialog( pParent, pDoc, pCurrentPage )); } -AbstractHeaderFooterDialog* SdAbstractDialogFactory_Impl::CreateHeaderFooterDialog( ViewShell* pViewShell, +AbstractHeaderFooterDialog* SdAbstractDialogFactory_Impl::CreateHeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) { return new AbstractHeaderFooterDialog_Impl( new ::sd::HeaderFooterDialog( (::sd::ViewShell*)pViewShell, pParent, pDoc, pCurrentPage )); diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index fa5e53ebac54..aa3312a779a5 100755 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -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,26 +28,26 @@ #define _SD_DLGFACT_HXX // include --------------------------------------------------------------- -#include "sdabstdlg.hxx" +#include "sdabstdlg.hxx" #include <sfx2/basedlgs.hxx> -#define DECL_ABSTDLG_BASE(Class,DialogClass) \ - DialogClass* pDlg; \ -public: \ - Class( DialogClass* p) \ - : pDlg(p) \ +#define DECL_ABSTDLG_BASE(Class,DialogClass) \ + DialogClass* pDlg; \ +public: \ + Class( DialogClass* p) \ + : pDlg(p) \ {} \ - virtual ~Class(); \ - virtual short Execute() ; + virtual ~Class(); \ + virtual short Execute() ; -#define IMPL_ABSTDLG_BASE(Class) \ -Class::~Class() \ +#define IMPL_ABSTDLG_BASE(Class) \ +Class::~Class() \ { \ - delete pDlg; \ -} \ + delete pDlg; \ +} \ short Class::Execute() \ { \ - return pDlg->Execute(); \ + return pDlg->Execute(); \ } namespace sd { @@ -69,7 +69,7 @@ class VclAbstractDialog_Impl : public VclAbstractDialog class AbstractCopyDlg_Impl : public AbstractCopyDlg { DECL_ABSTDLG_BASE(AbstractCopyDlg_Impl,::sd::CopyDlg) - virtual void GetAttr( SfxItemSet& rOutAttrs ); + virtual void GetAttr( SfxItemSet& rOutAttrs ); }; // add for SdCustomShowDlg @@ -77,8 +77,8 @@ class SdCustomShowDlg; class AbstractSdCustomShowDlg_Impl : public AbstractSdCustomShowDlg { DECL_ABSTDLG_BASE(AbstractSdCustomShowDlg_Impl,SdCustomShowDlg) - virtual BOOL IsModified() const ; - virtual BOOL IsCustomShow() const ; + virtual BOOL IsModified() const ; + virtual BOOL IsCustomShow() const ; }; //add for SdCharDlg begin @@ -86,13 +86,13 @@ class SfxTabDialog; class AbstractTabDialog_Impl : public SfxAbstractTabDialog { DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog ) - virtual void SetCurPageId( USHORT nId ); - virtual const SfxItemSet* GetOutputItemSet() const; - virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); - virtual void SetInputSet( const SfxItemSet* pInSet ); + virtual void SetCurPageId( USHORT nId ); + virtual const SfxItemSet* GetOutputItemSet() const; + virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); + virtual void SetInputSet( const SfxItemSet* pInSet ); //From class Window. - virtual void SetText( const XubString& rStr ); - virtual String GetText() const; + virtual void SetText( const XubString& rStr ); + virtual String GetText() const; }; //add for SdCharDlg end @@ -102,13 +102,13 @@ class SfxTabDialog; class AbstractBulletDialog_Impl : public SfxAbstractTabDialog { DECL_ABSTDLG_BASE( AbstractBulletDialog_Impl,SfxTabDialog ) - virtual void SetCurPageId( USHORT nId ); - virtual const SfxItemSet* GetOutputItemSet() const; - virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); - virtual void SetInputSet( const SfxItemSet* pInSet ); + virtual void SetCurPageId( USHORT nId ); + virtual const SfxItemSet* GetOutputItemSet() const; + virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); + virtual void SetInputSet( const SfxItemSet* pInSet ); //From class Window. - virtual void SetText( const XubString& rStr ); - virtual String GetText() const; + virtual void SetText( const XubString& rStr ); + virtual String GetText() const; }; //add for OutlineBulletDlg end @@ -116,13 +116,13 @@ class SdPresLayoutTemplateDlg; class SdPresLayoutTemplateDlg_Impl : public SfxAbstractTabDialog { DECL_ABSTDLG_BASE( SdPresLayoutTemplateDlg_Impl,SdPresLayoutTemplateDlg ) - virtual void SetCurPageId( USHORT nId ); - virtual const SfxItemSet* GetOutputItemSet() const; - virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); - virtual void SetInputSet( const SfxItemSet* pInSet ); + virtual void SetCurPageId( USHORT nId ); + virtual const SfxItemSet* GetOutputItemSet() const; + virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); + virtual void SetInputSet( const SfxItemSet* pInSet ); //From class Window. - virtual void SetText( const XubString& rStr ); - virtual String GetText() const; + virtual void SetText( const XubString& rStr ); + virtual String GetText() const; }; // add for AssistentDlg @@ -145,8 +145,8 @@ class SdModifyFieldDlg; class AbstractSdModifyFieldDlg_Impl : public AbstractSdModifyFieldDlg { DECL_ABSTDLG_BASE(AbstractSdModifyFieldDlg_Impl,SdModifyFieldDlg) - virtual SvxFieldData* GetField(); - virtual SfxItemSet GetItemSet(); + virtual SvxFieldData* GetField(); + virtual SfxItemSet GetItemSet(); }; // add for SdSnapLineDlg @@ -167,7 +167,7 @@ class SdInsertLayerDlg; class AbstractSdInsertLayerDlg_Impl : public AbstractSdInsertLayerDlg { DECL_ABSTDLG_BASE(AbstractSdInsertLayerDlg_Impl,SdInsertLayerDlg) - virtual void GetAttr( SfxItemSet& rOutAttrs ) ; + virtual void GetAttr( SfxItemSet& rOutAttrs ) ; //from class Window virtual void SetHelpId( ULONG nHelpId ) ; }; @@ -177,7 +177,7 @@ class SdInsertPasteDlg; class AbstractSdInsertPasteDlg_Impl : public AbstractSdInsertPasteDlg { DECL_ABSTDLG_BASE(AbstractSdInsertPasteDlg_Impl,SdInsertPasteDlg) - virtual BOOL IsInsertBefore() const; + virtual BOOL IsInsertBefore() const; }; // add for SdInsertPagesObjsDlg @@ -185,20 +185,20 @@ class SdInsertPagesObjsDlg; class AbstractSdInsertPagesObjsDlg_Impl : public AbstractSdInsertPagesObjsDlg { DECL_ABSTDLG_BASE(AbstractSdInsertPagesObjsDlg_Impl,SdInsertPagesObjsDlg) - virtual ::Window * GetWindow(); //this method is added for return a Window type pointer - virtual List* GetList( USHORT nType ); - virtual BOOL IsLink(); - virtual BOOL IsRemoveUnnessesaryMasterPages() const; + virtual ::Window * GetWindow(); //this method is added for return a Window type pointer + virtual List* GetList( USHORT nType ); + virtual BOOL IsLink(); + virtual BOOL IsRemoveUnnessesaryMasterPages() const; }; // add for MorphDlg class AbstractMorphDlg_Impl : public AbstractMorphDlg { DECL_ABSTDLG_BASE(AbstractMorphDlg_Impl,::sd::MorphDlg) - virtual void SaveSettings() const; - virtual USHORT GetFadeSteps() const; - virtual BOOL IsAttributeFade() const ; - virtual BOOL IsOrientationFade() const ; + virtual void SaveSettings() const; + virtual USHORT GetFadeSteps() const; + virtual BOOL IsAttributeFade() const ; + virtual BOOL IsOrientationFade() const ; }; // add for SdStartPresentationDlg @@ -206,7 +206,7 @@ class SdStartPresentationDlg; class AbstractSdStartPresDlg_Impl : public AbstractSdStartPresDlg { DECL_ABSTDLG_BASE(AbstractSdStartPresDlg_Impl,SdStartPresentationDlg) - virtual void GetAttr( SfxItemSet& rOutAttrs ); + virtual void GetAttr( SfxItemSet& rOutAttrs ); }; // add for SdPresLayoutDlg @@ -214,29 +214,29 @@ class SdPresLayoutDlg; class AbstractSdPresLayoutDlg_Impl : public AbstractSdPresLayoutDlg { DECL_ABSTDLG_BASE(AbstractSdPresLayoutDlg_Impl,SdPresLayoutDlg) - virtual void GetAttr(SfxItemSet& rOutAttrs); + virtual void GetAttr(SfxItemSet& rOutAttrs); }; // add for SdActionDlg -class SfxSingleTabDialog; -class AbstractSfxDialog_Impl : public SfxAbstractDialog +class SfxSingleTabDialog; +class AbstractSfxDialog_Impl : public SfxAbstractDialog { DECL_ABSTDLG_BASE(AbstractSfxDialog_Impl,SfxModalDialog) - virtual const SfxItemSet* GetOutputItemSet() const; - virtual void SetText( const XubString& rStr ); - virtual String GetText() const; + virtual const SfxItemSet* GetOutputItemSet() const; + virtual void SetText( const XubString& rStr ); + virtual String GetText() const; }; // add for SdVectorizeDlg -class SdVectorizeDlg; +class SdVectorizeDlg; class AbstractSdVectorizeDlg_Impl :public AbstractSdVectorizeDlg { DECL_ABSTDLG_BASE(AbstractSdVectorizeDlg_Impl,SdVectorizeDlg) - virtual const GDIMetaFile& GetGDIMetaFile() const ; + virtual const GDIMetaFile& GetGDIMetaFile() const ; }; // add for SdPublishingDlg -class SdPublishingDlg; +class SdPublishingDlg; class AbstractSdPublishingDlg_Impl :public AbstractSdPublishingDlg { DECL_ABSTDLG_BASE(AbstractSdPublishingDlg_Impl,SdPublishingDlg) @@ -258,42 +258,42 @@ class SdAbstractDialogFactory_Impl : public SdAbstractDialogFactory { public: - virtual VclAbstractDialog* CreateBreakDlg(::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, ULONG nSumActionCount, ULONG nObjCount ); - virtual AbstractCopyDlg* CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, XColorTable* pColTab, ::sd::View* pView ); - virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc ); - virtual SfxAbstractTabDialog* CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ); - virtual SfxAbstractTabDialog* CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, BOOL bAreaPage = TRUE ); - virtual AbstractAssistentDlg* CreateAssistentDlg( ::Window* pParent, BOOL bAutoPilot); - virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( ::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ); - virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView); - virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, String aStr ); - virtual AbstractSdInsertPasteDlg* CreateSdInsertPasteDlg( ::Window* pWindow ); + virtual VclAbstractDialog* CreateBreakDlg(::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, ULONG nSumActionCount, ULONG nObjCount ); + virtual AbstractCopyDlg* CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, XColorTable* pColTab, ::sd::View* pView ); + virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc ); + virtual SfxAbstractTabDialog* CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ); + virtual SfxAbstractTabDialog* CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, BOOL bAreaPage = TRUE ); + virtual AbstractAssistentDlg* CreateAssistentDlg( ::Window* pParent, BOOL bAutoPilot); + virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( ::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ); + virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView); + virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, String aStr ); + virtual AbstractSdInsertPasteDlg* CreateSdInsertPasteDlg( ::Window* pWindow ); virtual AbstractSdInsertPagesObjsDlg* CreateSdInsertPagesObjsDlg( ::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const String& rFileName ); - virtual AbstractMorphDlg* CreateMorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2); - virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg ( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = NULL ); - virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( ::Window* pParent, const SfxItemSet* pAttr ); - virtual AbstractSdStartPresDlg* CreateSdStartPresentationDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, List& rPageNames, List* pCSList ); - virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ); - virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs); - virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ); - virtual SfxAbstractDialog* CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ); - virtual AbstractSdVectorizeDlg* CreateSdVectorizeDlg( ::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ); - virtual AbstractSdPublishingDlg* CreateSdPublishingDlg( ::Window* pWindow, DocumentType eDocType); + virtual AbstractMorphDlg* CreateMorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2); + virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg ( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = NULL ); + virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( ::Window* pParent, const SfxItemSet* pAttr ); + virtual AbstractSdStartPresDlg* CreateSdStartPresentationDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, List& rPageNames, List* pCSList ); + virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ); + virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs); + virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ); + virtual SfxAbstractDialog* CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ); + virtual AbstractSdVectorizeDlg* CreateSdVectorizeDlg( ::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ); + virtual AbstractSdPublishingDlg* CreateSdPublishingDlg( ::Window* pWindow, DocumentType eDocType); - virtual VclAbstractDialog* CreateMasterLayoutDialog( ::Window* pParent, + virtual VclAbstractDialog* CreateMasterLayoutDialog( ::Window* pParent, SdDrawDocument* pDoc, SdPage* ); // add for MasterLayoutDialog - virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog( ViewShell* pViewShell, - ::Window* pParent, - SdDrawDocument* pDoc, + virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog( ViewShell* pViewShell, + ::Window* pParent, + SdDrawDocument* pDoc, SdPage* pCurrentPage ); // add for HeaderFooterDialog // For TabPage - virtual CreateTabPage GetSdOptionsContentsTabPageCreatorFunc(); - virtual CreateTabPage GetSdPrintOptionsTabPageCreatorFunc(); - virtual CreateTabPage GetSdOptionsMiscTabPageCreatorFunc(); - virtual CreateTabPage GetSdOptionsSnapTabPageCreatorFunc(); + virtual CreateTabPage GetSdOptionsContentsTabPageCreatorFunc(); + virtual CreateTabPage GetSdPrintOptionsTabPageCreatorFunc(); + virtual CreateTabPage GetSdOptionsMiscTabPageCreatorFunc(); + virtual CreateTabPage GetSdOptionsSnapTabPageCreatorFunc(); }; #endif diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index c1d81bc073b9..49c511d27389 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -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 @@ -57,9 +57,9 @@ \************************************************************************/ SdPresLayoutDlg::SdPresLayoutDlg( - ::sd::DrawDocShell* pDocShell, - ::sd::ViewShell* pViewShell, - ::Window* pWindow, + ::sd::DrawDocShell* pDocShell, + ::sd::ViewShell* pViewShell, + ::Window* pWindow, const SfxItemSet& rInAttrs ): ModalDialog (pWindow, SdResId(DLG_PRESLT)), mpDocSh ( pDocShell ), @@ -69,11 +69,11 @@ SdPresLayoutDlg::SdPresLayoutDlg( maBtnOK (this, SdResId(BTN_OK)), maBtnCancel (this, SdResId(BTN_CANCEL)), maBtnHelp (this, SdResId(BTN_HELP)), - maCbxMasterPage (this, SdResId(CBX_MASTER_PAGE)), - maCbxCheckMasters (this, SdResId(CBX_CHECK_MASTERS)), + maCbxMasterPage (this, SdResId(CBX_MASTER_PAGE)), + maCbxCheckMasters (this, SdResId(CBX_CHECK_MASTERS)), maBtnLoad (this, SdResId(BTN_LOAD)), mrOutAttrs (rInAttrs), - maStrNone ( SdResId( STR_NULL ) ) + maStrNone ( SdResId( STR_NULL ) ) { FreeResource(); @@ -87,7 +87,7 @@ SdPresLayoutDlg::SdPresLayoutDlg( /************************************************************************* |* -|* Dtor +|* Dtor |* *************************************************************************/ @@ -105,7 +105,7 @@ SdPresLayoutDlg::~SdPresLayoutDlg() /************************************************************************* |* -|* Initialisierung +|* Initialisierung |* *************************************************************************/ @@ -146,7 +146,7 @@ void SdPresLayoutDlg::Reset() /************************************************************************* |* -|* Fuellt uebergebenen Item-Set mit Dialogbox-Attributen +|* Fuellt uebergebenen Item-Set mit Dialogbox-Attributen |* *************************************************************************/ @@ -308,7 +308,7 @@ IMPL_LINK(SdPresLayoutDlg, ClickLoadHdl, void *, EMPTYARG) { ::sd::DrawDocShell* pTemplDocSh= pTemplDoc->GetDocSh(); -/* SdPage* pMaster = pTemplDoc->GetMasterSdPage( 0, PK_STANDARD ); +/* SdPage* pMaster = pTemplDoc->GetMasterSdPage( 0, PK_STANDARD ); mpLayoutNames->Insert( new String( maName ), LIST_APPEND ); Bitmap aBitmap( pTemplDocSh->GetPagePreviewBitmap( pMaster, 90 ) ); diff --git a/sd/source/ui/dlg/sdpreslt.src b/sd/source/ui/dlg/sdpreslt.src index 3aad51674a46..f1d18adfe99e 100644 --- a/sd/source/ui/dlg/sdpreslt.src +++ b/sd/source/ui/dlg/sdpreslt.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/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 275d39af4ea5..79d2300cb390 100755 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -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 @@ -58,7 +58,7 @@ #include <svtools/embedtransfer.hxx> #include <tools/diagnose_ex.h> #include <ViewShell.hxx> - + using namespace com::sun::star; class SdPageObjsTLB::IconProvider @@ -87,8 +87,8 @@ public: BOOL SD_DLLPRIVATE SdPageObjsTLB::bIsInDrag = FALSE; BOOL SdPageObjsTLB::IsInDrag() -{ - return bIsInDrag; +{ + return bIsInDrag; } sal_uInt32 SdPageObjsTLB::SdPageObjsTransferable::mnListBoxDropFormatId = SAL_MAX_UINT32; @@ -97,8 +97,8 @@ sal_uInt32 SdPageObjsTLB::SdPageObjsTransferable::mnListBoxDropFormatId = SAL_MA // - SdPageObjsTLB::SdPageObjsTransferable - // ----------------------------------------- -SdPageObjsTLB::SdPageObjsTransferable::SdPageObjsTransferable( - SdPageObjsTLB& rParent, +SdPageObjsTLB::SdPageObjsTransferable::SdPageObjsTransferable( + SdPageObjsTLB& rParent, const INetBookmark& rBookmark, ::sd::DrawDocShell& rDocShell, NavigatorDragType eDragType, @@ -110,7 +110,7 @@ SdPageObjsTLB::SdPageObjsTransferable::SdPageObjsTransferable( meDragType( eDragType ), maTreeListBoxData( rTreeListBoxData ) { -} +} @@ -122,7 +122,7 @@ SdPageObjsTLB::SdPageObjsTransferable::~SdPageObjsTransferable() // ----------------------------------------------------------------------------- void SdPageObjsTLB::SdPageObjsTransferable::AddSupportedFormats() -{ +{ AddFormat(SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK); AddFormat(SOT_FORMATSTR_ID_TREELISTBOX); AddFormat(GetListBoxDropFormatId()); @@ -240,19 +240,19 @@ sal_uInt32 SdPageObjsTLB::SdPageObjsTransferable::GetListBoxDropFormatId (void) |* \************************************************************************/ -SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId ) -: SvTreeListBox ( pParentWin, rSdResId ) -, mpParent ( pParentWin ) -, mpDoc ( NULL ) -, mpBookmarkDoc ( NULL ) -, mpMedium ( NULL ) -, mpOwnMedium ( NULL ) -, maImgOle ( BitmapEx( SdResId( BMP_OLE ) ) ) -, maImgGraphic ( BitmapEx( SdResId( BMP_GRAPHIC ) ) ) -, maImgOleH ( BitmapEx( SdResId( BMP_OLE_H ) ) ) -, maImgGraphicH ( BitmapEx( SdResId( BMP_GRAPHIC_H ) ) ) -, mbLinkableSelected ( FALSE ) -, mpDropNavWin ( NULL ) +SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId ) +: SvTreeListBox ( pParentWin, rSdResId ) +, mpParent ( pParentWin ) +, mpDoc ( NULL ) +, mpBookmarkDoc ( NULL ) +, mpMedium ( NULL ) +, mpOwnMedium ( NULL ) +, maImgOle ( BitmapEx( SdResId( BMP_OLE ) ) ) +, maImgGraphic ( BitmapEx( SdResId( BMP_GRAPHIC ) ) ) +, maImgOleH ( BitmapEx( SdResId( BMP_OLE_H ) ) ) +, maImgGraphicH ( BitmapEx( SdResId( BMP_GRAPHIC_H ) ) ) +, mbLinkableSelected ( FALSE ) +, mpDropNavWin ( NULL ) , mbShowAllShapes ( false ) , mbShowAllPages ( false ) @@ -403,7 +403,7 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, BOOL bAllPages, mbShowAllPages = (bAllPages == TRUE); mpMedium = NULL; - SdPage* pPage = NULL; + SdPage* pPage = NULL; IconProvider aIconProvider; @@ -633,10 +633,10 @@ BOOL SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc ) if( !mpDoc ) return( FALSE ); - SdrObject* pObj = NULL; - SdPage* pPage = NULL; + SdrObject* pObj = NULL; + SdPage* pPage = NULL; SvLBoxEntry* pEntry = First(); - String aName; + String aName; // Alle Pages incl. Objekte vergleichen USHORT nPage = 0; @@ -709,7 +709,7 @@ String SdPageObjsTLB::GetSelectEntry() List* SdPageObjsTLB::GetSelectEntryList( USHORT nDepth ) { - List* pList = NULL; + List* pList = NULL; SvLBoxEntry* pEntry = FirstSelected(); while( pEntry ) @@ -741,8 +741,8 @@ void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFileEntry ) { if( GetBookmarkDoc() ) { - SdrObject* pObj = NULL; - SdPage* pPage = NULL; + SdrObject* pObj = NULL; + SdPage* pPage = NULL; SvLBoxEntry* pPageEntry = NULL; Image aImgPage=Image( BitmapEx( SdResId( BMP_PAGE ) ) ); @@ -824,8 +824,8 @@ void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFileEntry ) /************************************************************************* |* -|* Prueft, ob es sich um eine Draw-Datei handelt und oeffnet anhand des -|* uebergebenen Docs das BookmarkDoc +|* Prueft, ob es sich um eine Draw-Datei handelt und oeffnet anhand des +|* uebergebenen Docs das BookmarkDoc |* \************************************************************************/ @@ -976,10 +976,10 @@ void SdPageObjsTLB::StartDrag( sal_Int8 nAction, const Point& rPosPixel) { (void)nAction; (void)rPosPixel; - + SdNavigatorWin* pNavWin = NULL; SvLBoxEntry* pEntry = GetEntry(rPosPixel); - + if( mpFrame->HasChildWindow( SID_NAVIGATOR ) ) pNavWin = (SdNavigatorWin*) ( mpFrame->GetChildWindow( SID_NAVIGATOR )->GetContextWindow( SD_MOD() ) ); @@ -1038,16 +1038,16 @@ void SdPageObjsTLB::DoDrag() { ::sd::DrawDocShell* pDocShell = mpDoc->GetDocSh(); String aURL = INetURLObject( pDocShell->GetMedium()->GetPhysicalName(), INET_PROT_FILE ).GetMainURL( INetURLObject::NO_DECODE ); - NavigatorDragType eDragType = mpDropNavWin->GetNavigatorDragType(); + NavigatorDragType eDragType = mpDropNavWin->GetNavigatorDragType(); aURL.Append( '#' ); aURL.Append( GetSelectEntry() ); - INetBookmark aBookmark( aURL, GetSelectEntry() ); - sal_Int8 nDNDActions = DND_ACTION_COPYMOVE; + INetBookmark aBookmark( aURL, GetSelectEntry() ); + sal_Int8 nDNDActions = DND_ACTION_COPYMOVE; if( eDragType == NAVIGATOR_DRAGTYPE_LINK ) - nDNDActions = DND_ACTION_LINK; // #93240# Either COPY *or* LINK, never both! + nDNDActions = DND_ACTION_LINK; // #93240# Either COPY *or* LINK, never both! SvTreeListBox::ReleaseMouse(); @@ -1061,7 +1061,7 @@ void SdPageObjsTLB::DoDrag() ::com::sun::star::uno::Sequence<sal_Int8> aSequence (sizeof(SvLBoxDDInfo)); memcpy(aSequence.getArray(), (sal_Char*)&aDDInfo, sizeof(SvLBoxDDInfo)); ::com::sun::star::uno::Any aTreeListBoxData (aSequence); - + // object is destroyed by internal reference mechanism SdTransferable* pTransferable = new SdPageObjsTLB::SdPageObjsTransferable( *this, aBookmark, *pDocShell, eDragType, aTreeListBoxData); @@ -1142,7 +1142,7 @@ void SdPageObjsTLB::OnDragFinished( sal_uInt8 ) sal_Int8 SdPageObjsTLB::AcceptDrop (const AcceptDropEvent& rEvent) { sal_Int8 nResult (DND_ACTION_NONE); - + if ( !bIsInDrag && IsDropFormatSupported( FORMAT_FILE ) ) { nResult = rEvent.mnAction; @@ -1171,11 +1171,11 @@ sal_Int8 SdPageObjsTLB::AcceptDrop (const AcceptDropEvent& rEvent) } } } - + // Hide emphasis when there is no valid drop action. if (nResult == DND_ACTION_NONE) ImplShowTargetEmphasis(pTargetEntry, FALSE); - + return nResult; } @@ -1194,16 +1194,16 @@ sal_Int8 SdPageObjsTLB::ExecuteDrop( const ExecuteDropEvent& rEvt ) if( !bIsInDrag ) { SdNavigatorWin* pNavWin = NULL; - USHORT nId = SID_NAVIGATOR; - + USHORT nId = SID_NAVIGATOR; + if( mpFrame->HasChildWindow( nId ) ) pNavWin = (SdNavigatorWin*)( mpFrame->GetChildWindow( nId )->GetContextWindow( SD_MOD() ) ); - + if( pNavWin && ( pNavWin == mpParent ) ) { - TransferableDataHelper aDataHelper( rEvt.maDropEvent.Transferable ); - String aFile; - + TransferableDataHelper aDataHelper( rEvt.maDropEvent.Transferable ); + String aFile; + if( aDataHelper.GetString( FORMAT_FILE, aFile ) && ( (SdNavigatorWin*) mpParent)->InsertFile( aFile ) ) { @@ -1232,8 +1232,8 @@ sal_Int8 SdPageObjsTLB::ExecuteDrop( const ExecuteDropEvent& rEvt ) IMPL_STATIC_LINK(SdPageObjsTLB, ExecDragHdl, void*, EMPTYARG) { - // als Link, damit asynchron ohne ImpMouseMoveMsg auf dem Stack auch der - // Navigator geloescht werden darf + // als Link, damit asynchron ohne ImpMouseMoveMsg auf dem Stack auch der + // Navigator geloescht werden darf pThis->DoDrag(); return 0; } @@ -1336,7 +1336,7 @@ SvLBoxEntry* SdPageObjsTLB::GetDropTarget (const Point& rLocation) if (pEntry == NULL) return NULL; - OSL_TRACE("entry is %s", + OSL_TRACE("entry is %s", ::rtl::OUStringToOString(GetEntryText(pEntry), RTL_TEXTENCODING_UTF8).getStr()); if (GetParent(pEntry) == NULL) { @@ -1360,7 +1360,7 @@ SvLBoxEntry* SdPageObjsTLB::GetDropTarget (const Point& rLocation) else break; } - OSL_TRACE("returning %s", + OSL_TRACE("returning %s", ::rtl::OUStringToOString(GetEntryText(pEntry), RTL_TEXTENCODING_UTF8).getStr()); } @@ -1374,7 +1374,7 @@ bool SdPageObjsTLB::IsDropAllowed (SvLBoxEntry* pEntry) { if (pEntry == NULL) return false; - + if ( ! IsDropFormatSupported(SdPageObjsTransferable::GetListBoxDropFormatId())) return false; @@ -1426,7 +1426,7 @@ void SdPageObjsTLB::AddShapeToTransferable ( Point aDragPos (rObject.GetCurrentBoundRect().Center()); //Point aDragPos (0,0); aObjectDescriptor.maDragStartPos = aDragPos; - // aObjectDescriptor.maSize = GetAllMarkedRect().GetSize(); + // aObjectDescriptor.maSize = GetAllMarkedRect().GetSize(); if (pDocShell != NULL) aObjectDescriptor.maDisplayName = pDocShell->GetMedium()->GetURLObject().GetURLNoPass(); else diff --git a/sd/source/ui/dlg/sduiexp.cxx b/sd/source/ui/dlg/sduiexp.cxx index 60c40929344a..6f94ff85324b 100644 --- a/sd/source/ui/dlg/sduiexp.cxx +++ b/sd/source/ui/dlg/sduiexp.cxx @@ -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/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx index 5fd9af68eee0..7fc511e18d68 100644 --- a/sd/source/ui/dlg/tabtempl.cxx +++ b/sd/source/ui/dlg/tabtempl.cxx @@ -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 @@ -71,14 +71,14 @@ SdTabTemplateDlg::SdTabTemplateDlg( Window* pParent, SdrModel* pModel, SdrView* pView ) : SfxStyleDialog ( pParent, SdResId( TAB_TEMPLATE ), rStyleBase, FALSE ), - rDocShell ( *pDocShell ), - pSdrView ( pView ), - pColorTab ( pModel->GetColorTable() ), - pGradientList ( pModel->GetGradientList() ), - pHatchingList ( pModel->GetHatchList() ), - pBitmapList ( pModel->GetBitmapList() ), - pDashList ( pModel->GetDashList() ), - pLineEndList ( pModel->GetLineEndList() ) + rDocShell ( *pDocShell ), + pSdrView ( pView ), + pColorTab ( pModel->GetColorTable() ), + pGradientList ( pModel->GetGradientList() ), + pHatchingList ( pModel->GetHatchList() ), + pBitmapList ( pModel->GetBitmapList() ), + pDashList ( pModel->GetDashList() ), + pLineEndList ( pModel->GetLineEndList() ) { FreeResource(); diff --git a/sd/source/ui/dlg/tabtempl.src b/sd/source/ui/dlg/tabtempl.src index 5ff92235036c..558fd38114cb 100644 --- a/sd/source/ui/dlg/tabtempl.src +++ b/sd/source/ui/dlg/tabtempl.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 @@ -120,7 +120,7 @@ TabDialog TAB_TEMPLATE Identifier = RID_SVXPAGE_PARA_ASIAN ; PageResID = RID_SVXPAGE_PARA_ASIAN ; Text[ en-US ] = "Asian Typography"; - }; + }; PageItem { Identifier = RID_SVXPAGE_TABULATOR ; diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index af2668fc9dad..b65e3c119061 100755 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -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 @@ #undef SD_DLLIMPLEMENTATION #endif -#include <svx/svxids.hrc> +#include <svx/svxids.hrc> #include <com/sun/star/presentation/AnimationEffect.hpp> #include <com/sun/star/presentation/ClickAction.hpp> #include <com/sun/star/presentation/AnimationSpeed.hpp> @@ -96,8 +96,8 @@ using namespace com::sun::star::lang; SdActionDlg::SdActionDlg ( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) : - SfxSingleTabDialog ( pParent, *pAttr, TP_ANIMATION_ACTION ), - rOutAttrs ( *pAttr ) + SfxSingleTabDialog ( pParent, *pAttr, TP_ANIMATION_ACTION ), + rOutAttrs ( *pAttr ) { // FreeResource(); SfxTabPage* pNewPage = SdTPAction::Create( this, rOutAttrs ); @@ -117,32 +117,32 @@ SdActionDlg::SdActionDlg ( /************************************************************************* |* -|* Action-TabPage +|* Action-TabPage |* \************************************************************************/ SdTPAction::SdTPAction( Window* pWindow, const SfxItemSet& rInAttrs ) : - SfxTabPage ( pWindow, SdResId( TP_ANIMATION ), rInAttrs ), - - aFtAction ( this, SdResId( FT_ACTION ) ), - aLbAction ( this, SdResId( LB_ACTION ) ), - aFtTree ( this, SdResId( FT_TREE ) ), - aLbTree ( this, SdResId( LB_TREE ) ), - aLbTreeDocument ( this, SdResId( LB_TREE_DOCUMENT ) ), - aLbOLEAction ( this, SdResId( LB_OLE_ACTION ) ), - aFlSeparator ( this, SdResId( FL_SEPARATOR ) ), - aEdtSound ( this, SdResId( EDT_SOUND ) ), - aEdtBookmark ( this, SdResId( EDT_BOOKMARK ) ), - aEdtDocument ( this, SdResId( EDT_DOCUMENT ) ), + SfxTabPage ( pWindow, SdResId( TP_ANIMATION ), rInAttrs ), + + aFtAction ( this, SdResId( FT_ACTION ) ), + aLbAction ( this, SdResId( LB_ACTION ) ), + aFtTree ( this, SdResId( FT_TREE ) ), + aLbTree ( this, SdResId( LB_TREE ) ), + aLbTreeDocument ( this, SdResId( LB_TREE_DOCUMENT ) ), + aLbOLEAction ( this, SdResId( LB_OLE_ACTION ) ), + aFlSeparator ( this, SdResId( FL_SEPARATOR ) ), + aEdtSound ( this, SdResId( EDT_SOUND ) ), + aEdtBookmark ( this, SdResId( EDT_BOOKMARK ) ), + aEdtDocument ( this, SdResId( EDT_DOCUMENT ) ), aEdtProgram ( this, SdResId( EDT_PROGRAM ) ), aEdtMacro ( this, SdResId( EDT_MACRO ) ), - aBtnSearch ( this, SdResId( BTN_SEARCH ) ), - aBtnSeek ( this, SdResId( BTN_SEEK ) ), + aBtnSearch ( this, SdResId( BTN_SEARCH ) ), + aBtnSeek ( this, SdResId( BTN_SEEK ) ), - rOutAttrs ( rInAttrs ), - mpView ( NULL ), - mpDoc ( NULL ), - bTreeUpdated ( FALSE ) + rOutAttrs ( rInAttrs ), + mpView ( NULL ), + mpDoc ( NULL ), + bTreeUpdated ( FALSE ) { FreeResource(); @@ -226,11 +226,11 @@ void SdTPAction::Construct() { pGrafObj = (SdrGrafObj*) pObj; } -// // VCXControl ? -// else if( pObj->IsA( TYPE( VCSbxDrawObject ) ) ) -// { -// bDisableAll = TRUE; -// } +// // VCXControl ? +// else if( pObj->IsA( TYPE( VCSbxDrawObject ) ) ) +// { +// bDisableAll = TRUE; +// } } } if( pGrafObj ) @@ -344,7 +344,7 @@ BOOL SdTPAction::FillItemSet( SfxItemSet& rAttrs ) void SdTPAction::Reset( const SfxItemSet& rAttrs ) { presentation::ClickAction eCA = presentation::ClickAction_NONE; - String aFileName; + String aFileName; // aLbAction if( rAttrs.GetItemState( ATTR_ACTION ) != SFX_ITEM_DONTCARE ) @@ -447,7 +447,7 @@ void SdTPAction::OpenFileDialog() if (bSound) { - SdOpenSoundFileDialog aFileDialog; + SdOpenSoundFileDialog aFileDialog; if( !aFile.Len() ) aFile = SvtPathOptions().GetGraphicPath(); @@ -709,7 +709,7 @@ IMPL_LINK( SdTPAction, CheckFileHdl, void *, EMPTYARG ) // Ueberpruefen, ob es eine gueltige Draw-Datei ist SfxMedium aMedium( aFile, STREAM_READ | STREAM_NOCREATE, - TRUE ); // Download + TRUE ); // Download if( aMedium.IsStorage() ) { @@ -774,8 +774,8 @@ void SdTPAction::SetActualClickAction( presentation::ClickAction eCA ) void SdTPAction::SetEditText( String const & rStr ) { - presentation::ClickAction eCA = GetActualClickAction(); - String aText(rStr); + presentation::ClickAction eCA = GetActualClickAction(); + String aText(rStr); // possibly convert URI back to system path switch( eCA ) @@ -794,7 +794,7 @@ void SdTPAction::SetEditText( String const & rStr ) String aTmpStr(aURL.getFSysPath(INetURLObject::FSYS_DETECT)); if( aTmpStr.Len() ) - aText = aTmpStr; // was a system path + aText = aTmpStr; // was a system path } break; default: @@ -915,8 +915,8 @@ USHORT SdTPAction::GetClickActionSdResId( presentation::ClickAction eCA ) case presentation::ClickAction_DOCUMENT: return STR_CLICK_ACTION_DOCUMENT; case presentation::ClickAction_PROGRAM: return STR_CLICK_ACTION_PROGRAM; case presentation::ClickAction_MACRO: return STR_CLICK_ACTION_MACRO; - case presentation::ClickAction_SOUND: return STR_CLICK_ACTION_SOUND; - case presentation::ClickAction_VERB: return STR_CLICK_ACTION_VERB; + case presentation::ClickAction_SOUND: return STR_CLICK_ACTION_SOUND; + case presentation::ClickAction_VERB: return STR_CLICK_ACTION_VERB; case presentation::ClickAction_STOPPRESENTATION: return STR_CLICK_ACTION_STOPPRESENTATION; default: DBG_ERROR( "Keine StringResource fuer ClickAction vorhanden!" ); } diff --git a/sd/source/ui/dlg/tpaction.src b/sd/source/ui/dlg/tpaction.src index fa951644c580..118f4eda4c7a 100644 --- a/sd/source/ui/dlg/tpaction.src +++ b/sd/source/ui/dlg/tpaction.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 @@ -37,8 +37,8 @@ TabPage TP_ANIMATION Size = MAP_APPFONT ( 260 , 164 ) ; Hide = TRUE; // always visible --------------------------------------------------------------------- -#define MA_ACTIONLB_TOP (RSC_SP_DLG_INNERBORDER_TOP + (2*RSC_CD_PUSHBUTTON_HEIGHT + RSC_SP_CTRL_GROUP_Y - RSC_CD_DROPDOWN_HEIGHT) / 2) -#define MA_ACTIONLB_LEFT (103) +#define MA_ACTIONLB_TOP (RSC_SP_DLG_INNERBORDER_TOP + (2*RSC_CD_PUSHBUTTON_HEIGHT + RSC_SP_CTRL_GROUP_Y - RSC_CD_DROPDOWN_HEIGHT) / 2) +#define MA_ACTIONLB_LEFT (103) FixedText FT_ACTION { Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_ACTIONLB_TOP + 1 ) ; @@ -72,7 +72,7 @@ TabPage TP_ANIMATION TabStop = TRUE ; Hide = TRUE ; }; - + // Es ist schon wichtig, daß Durchsuchen (search) und Suchen (seek/find) unter- // schiedlich heissen, da sie eben auch eine unterschiedliche Bedeutung haben PushButton BTN_SEARCH diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index bdb4cc230537..ae6a44a12fd1 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -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 @@ -64,7 +64,7 @@ using namespace ::com::sun::star::uno; /************************************************************************* |* -|* TabPage zum Einstellen der Fang-Optionen +|* TabPage zum Einstellen der Fang-Optionen |* \************************************************************************/ @@ -157,7 +157,7 @@ SfxTabPage* SdTpOptionsSnap::Create( Window* pWindow, /************************************************************************* |* -|* TabPage zum Einstellen der Inhalte-Optionen +|* TabPage zum Einstellen der Inhalte-Optionen |* \************************************************************************/ @@ -185,10 +185,10 @@ BOOL SdTpOptionsContents::FillItemSet( SfxItemSet& rAttrs ) BOOL bModified = FALSE; if( aCbxRuler.GetSavedValue() != aCbxRuler.IsChecked() || - aCbxMoveOutline.GetSavedValue() != aCbxMoveOutline.IsChecked() || - aCbxDragStripes.GetSavedValue() != aCbxDragStripes.IsChecked() || - //aCbxHelplines.GetSavedValue() != aCbxHelplines.IsChecked() || - aCbxHandlesBezier.GetSavedValue() != aCbxHandlesBezier.IsChecked() ) + aCbxMoveOutline.GetSavedValue() != aCbxMoveOutline.IsChecked() || + aCbxDragStripes.GetSavedValue() != aCbxDragStripes.IsChecked() || + //aCbxHelplines.GetSavedValue() != aCbxHelplines.IsChecked() || + aCbxHandlesBezier.GetSavedValue() != aCbxHandlesBezier.IsChecked() ) { SdOptionsLayoutItem aOptsItem( ATTR_OPTIONS_LAYOUT ); @@ -237,7 +237,7 @@ SfxTabPage* SdTpOptionsContents::Create( Window* pWindow, /************************************************************************* |* -|* TabPage zum Einstellen der Sonstige-Optionen +|* TabPage zum Einstellen der Sonstige-Optionen |* \************************************************************************/ #define TABLE_COUNT 12 @@ -264,9 +264,9 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs ) aTxtTabstop ( this, SdResId( FT_TABSTOP ) ), aMtrFldTabstop ( this, SdResId( MTR_FLD_TABSTOP ) ), - aCbxStartWithActualPage ( this, SdResId( CBX_START_WITH_ACTUAL_PAGE ) ), + aCbxStartWithActualPage ( this, SdResId( CBX_START_WITH_ACTUAL_PAGE ) ), aGrpStartWithActualPage ( this, SdResId( GRP_START_WITH_ACTUAL_PAGE ) ), - aTxtCompatibility ( this, SdResId( FT_COMPATIBILITY ) ), + aTxtCompatibility ( this, SdResId( FT_COMPATIBILITY ) ), aCbxUsePrinterMetrics ( this, SdResId( CB_USE_PRINTER_METRICS ) ), aCbxCompatibility ( this, SdResId( CB_MERGE_PARA_DIST ) ), aGrpScale ( this, SdResId( GRP_SCALE ) ), @@ -423,15 +423,15 @@ BOOL SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) { BOOL bModified = FALSE; - if( aCbxStartWithTemplate.GetSavedValue() != aCbxStartWithTemplate.IsChecked() || + if( aCbxStartWithTemplate.GetSavedValue() != aCbxStartWithTemplate.IsChecked() || aCbxMarkedHitMovesAlways.GetSavedValue()!= aCbxMarkedHitMovesAlways.IsChecked() || - aCbxCrookNoContortion.GetSavedValue() != aCbxCrookNoContortion.IsChecked() || - aCbxQuickEdit.GetSavedValue() != aCbxQuickEdit.IsChecked() || - aCbxPickThrough.GetSavedValue() != aCbxPickThrough.IsChecked() || - aCbxMasterPageCache.GetSavedValue() != aCbxMasterPageCache.IsChecked() || - aCbxCopy.GetSavedValue() != aCbxCopy.IsChecked() || + aCbxCrookNoContortion.GetSavedValue() != aCbxCrookNoContortion.IsChecked() || + aCbxQuickEdit.GetSavedValue() != aCbxQuickEdit.IsChecked() || + aCbxPickThrough.GetSavedValue() != aCbxPickThrough.IsChecked() || + aCbxMasterPageCache.GetSavedValue() != aCbxMasterPageCache.IsChecked() || + aCbxCopy.GetSavedValue() != aCbxCopy.IsChecked() || aCbxStartWithActualPage.GetSavedValue() != aCbxStartWithActualPage.IsChecked() || - aCbxCompatibility.GetSavedValue() != aCbxCompatibility.IsChecked() || + aCbxCompatibility.GetSavedValue() != aCbxCompatibility.IsChecked() || aCbxUsePrinterMetrics.GetSavedValue() != aCbxUsePrinterMetrics.IsChecked() ) { SdOptionsMiscItem aOptsItem( ATTR_OPTIONS_MISC ); @@ -446,7 +446,7 @@ BOOL SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) aOptsItem.GetOptionsMisc().SetStartWithActualPage( aCbxStartWithActualPage.IsChecked() ); aOptsItem.GetOptionsMisc().SetSummationOfParagraphs( aCbxCompatibility.IsChecked() ); aOptsItem.GetOptionsMisc().SetPrinterIndependentLayout ( - aCbxUsePrinterMetrics.IsChecked() + aCbxUsePrinterMetrics.IsChecked() ? ::com::sun::star::document::PrinterIndependentLayout::DISABLED : ::com::sun::star::document::PrinterIndependentLayout::ENABLED); rAttrs.Put( aOptsItem ); @@ -620,7 +620,7 @@ void SdTpOptionsMisc::SetImpressMode (void) - aCbxQuickEdit.GetPosPixel().Y(); // Put both "Text objects" check boxes side by side. - lcl_MoveWin (aCbxPickThrough, + lcl_MoveWin (aCbxPickThrough, nDialogWidth/2 - aCbxPickThrough.GetPosPixel().X(), -nLineHeight); @@ -828,7 +828,7 @@ void SdTpOptionsMisc::UpdateCompatibilityControls (void) break; } } - + } while (false); // One 'loop'. } @@ -837,7 +837,7 @@ void SdTpOptionsMisc::UpdateCompatibilityControls (void) // When there is an exception then simply use the default value of // bIsEnabled and disable the controls. } - + aTxtCompatibility.Enable (bIsEnabled); aCbxCompatibility.Enable(bIsEnabled); aCbxUsePrinterMetrics.Enable (bIsEnabled); diff --git a/sd/source/ui/dlg/tpoption.src b/sd/source/ui/dlg/tpoption.src index 96149d4e6a1f..b5f5ae0883a5 100644 --- a/sd/source/ui/dlg/tpoption.src +++ b/sd/source/ui/dlg/tpoption.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/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx index e04b4547fc66..227e2d2652b0 100644 --- a/sd/source/ui/dlg/unchss.cxx +++ b/sd/source/ui/dlg/unchss.cxx @@ -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/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx index 7cd0be451c4b..a78fafa21d78 100644 --- a/sd/source/ui/dlg/vectdlg.cxx +++ b/sd/source/ui/dlg/vectdlg.cxx @@ -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 @@ -60,29 +60,29 @@ // - SdVectorizeDlg - // ------------------ -SdVectorizeDlg::SdVectorizeDlg( +SdVectorizeDlg::SdVectorizeDlg( Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) : ModalDialog ( pParent, SdResId( DLG_VECTORIZE ) ), mpDocSh ( pDocShell ), aGrpSettings ( this, SdResId( GRP_SETTINGS ) ), - aFtLayers ( this, SdResId( FT_LAYERS ) ), - aNmLayers ( this, SdResId( NM_LAYERS ) ), - aFtReduce ( this, SdResId( FT_REDUCE ) ), - aMtReduce ( this, SdResId( MT_REDUCE ) ), - aFtFillHoles ( this, SdResId( FT_FILLHOLES ) ), - aMtFillHoles ( this, SdResId( MT_FILLHOLES ) ), - aCbFillHoles ( this, SdResId( CB_FILLHOLES ) ), - aFtOriginal ( this, SdResId( FT_ORIGINAL ) ), - aBmpWin ( this, SdResId( CTL_BMP ) ), - aFtVectorized ( this, SdResId( FT_VECTORIZED ) ), - aMtfWin ( this, SdResId( CTL_WMF ) ), - aGrpPrgs ( this, SdResId( GRP_PRGS ) ), - aPrgs ( this, SdResId( WND_PRGS ) ), + aFtLayers ( this, SdResId( FT_LAYERS ) ), + aNmLayers ( this, SdResId( NM_LAYERS ) ), + aFtReduce ( this, SdResId( FT_REDUCE ) ), + aMtReduce ( this, SdResId( MT_REDUCE ) ), + aFtFillHoles ( this, SdResId( FT_FILLHOLES ) ), + aMtFillHoles ( this, SdResId( MT_FILLHOLES ) ), + aCbFillHoles ( this, SdResId( CB_FILLHOLES ) ), + aFtOriginal ( this, SdResId( FT_ORIGINAL ) ), + aBmpWin ( this, SdResId( CTL_BMP ) ), + aFtVectorized ( this, SdResId( FT_VECTORIZED ) ), + aMtfWin ( this, SdResId( CTL_WMF ) ), + aGrpPrgs ( this, SdResId( GRP_PRGS ) ), + aPrgs ( this, SdResId( WND_PRGS ) ), aBtnOK ( this, SdResId( BTN_OK ) ), aBtnCancel ( this, SdResId( BTN_CANCEL ) ), aBtnHelp ( this, SdResId( BTN_HELP ) ), - aBtnPreview ( this, SdResId( BTN_PREVIEW ) ), - aBmp ( rBmp ) + aBtnPreview ( this, SdResId( BTN_PREVIEW ) ), + aBmp ( rBmp ) { FreeResource(); @@ -115,7 +115,7 @@ Rectangle SdVectorizeDlg::GetRect( const Size& rDispSize, const Size& rBmpSize ) if( rBmpSize.Width() && rBmpSize.Height() && rDispSize.Width() && rDispSize.Height() ) { - Size aBmpSize( rBmpSize ); + Size aBmpSize( rBmpSize ); const double fGrfWH = (double) aBmpSize.Width() / aBmpSize.Height(); const double fWinWH = (double) rDispSize.Width() / rDispSize.Height(); @@ -154,8 +154,8 @@ void SdVectorizeDlg::InitPreviewBmp() Bitmap SdVectorizeDlg::GetPreparedBitmap( Bitmap& rBmp, Fraction& rScale ) { - Bitmap aNew( rBmp ); - const Size aSizePix( aNew.GetSizePixel() ); + Bitmap aNew( rBmp ); + const Size aSizePix( aNew.GetSizePixel() ); if( aSizePix.Width() > VECTORIZE_MAX_EXTENT || aSizePix.Height() > VECTORIZE_MAX_EXTENT ) { @@ -178,8 +178,8 @@ void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf ) mpDocSh->SetWaitCursor( TRUE ); aPrgs.SetValue( 0 ); - Fraction aScale; - Bitmap aTmp( GetPreparedBitmap( rBmp, aScale ) ); + Fraction aScale; + Bitmap aTmp( GetPreparedBitmap( rBmp, aScale ) ); if( !!aTmp ) { @@ -188,19 +188,19 @@ void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf ) if( aCbFillHoles.IsChecked() ) { - GDIMetaFile aNewMtf; - BitmapReadAccess* pRAcc = aTmp.AcquireReadAccess(); + GDIMetaFile aNewMtf; + BitmapReadAccess* pRAcc = aTmp.AcquireReadAccess(); if( pRAcc ) { - const long nWidth = pRAcc->Width(); - const long nHeight = pRAcc->Height(); - const long nTileX = static_cast<long>(aMtFillHoles.GetValue()); - const long nTileY = static_cast<long>(aMtFillHoles.GetValue()); - const long nCountX = nWidth / nTileX; - const long nCountY = nHeight / nTileY; - const long nRestX = nWidth % nTileX; - const long nRestY = nHeight % nTileY; + const long nWidth = pRAcc->Width(); + const long nHeight = pRAcc->Height(); + const long nTileX = static_cast<long>(aMtFillHoles.GetValue()); + const long nTileY = static_cast<long>(aMtFillHoles.GetValue()); + const long nCountX = nWidth / nTileX; + const long nCountY = nHeight / nTileY; + const long nRestX = nWidth % nTileX; + const long nRestY = nHeight % nTileY; MapMode aMap( rMtf.GetPrefMapMode() ); aNewMtf.SetPrefSize( rMtf.GetPrefSize() ); @@ -251,10 +251,10 @@ void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf ) void SdVectorizeDlg::AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf, long nPosX, long nPosY, long nWidth, long nHeight ) { - ULONG nSumR = 0UL, nSumG = 0UL, nSumB = 0UL; - const long nRight = nPosX + nWidth - 1L; - const long nBottom = nPosY + nHeight - 1L; - const double fMult = 1.0 / ( nWidth * nHeight ); + ULONG nSumR = 0UL, nSumG = 0UL, nSumB = 0UL; + const long nRight = nPosX + nWidth - 1L; + const long nBottom = nPosY + nHeight - 1L; + const double fMult = 1.0 / ( nWidth * nHeight ); for( long nY = nPosY; nY <= nBottom; nY++ ) { @@ -272,8 +272,8 @@ void SdVectorizeDlg::AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf, (BYTE) FRound( nSumG * fMult ), (BYTE) FRound( nSumB * fMult ) ); - Rectangle aRect( Point( nPosX, nPosY ), Size( nWidth + 1, nHeight + 1 ) ); - const Size& rMaxSize = rMtf.GetPrefSize(); + Rectangle aRect( Point( nPosX, nPosY ), Size( nWidth + 1, nHeight + 1 ) ); + const Size& rMaxSize = rMtf.GetPrefSize(); aRect = PixelToLogic( aRect, rMtf.GetPrefMapMode() ); @@ -352,14 +352,14 @@ IMPL_LINK( SdVectorizeDlg, ModifyHdl, void*, EMPTYARG ) void SdVectorizeDlg::LoadSettings() { - SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream( + SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( SD_OPTION_VECTORIZE ) ), SD_OPTION_LOAD ) ); - UINT16 nLayers; - UINT16 nReduce; - UINT16 nFillHoles; - BOOL bFillHoles; + UINT16 nLayers; + UINT16 nReduce; + UINT16 nFillHoles; + BOOL bFillHoles; if( xIStm.Is() ) { diff --git a/sd/source/ui/dlg/vectdlg.src b/sd/source/ui/dlg/vectdlg.src index 53b77ad49eab..70b5701c13a0 100644 --- a/sd/source/ui/dlg/vectdlg.src +++ b/sd/source/ui/dlg/vectdlg.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 |