[Libreoffice-commits] .: Branch 'gr2' - 11 commits - sd/inc sd/source sd/uiconfig
Martin Hosken
mhosken at kemper.freedesktop.org
Thu Mar 10 00:05:12 PST 2011
sd/inc/pglink.hxx | 8
sd/inc/stlpool.hxx | 5
sd/source/core/CustomAnimationCloner.cxx | 2
sd/source/core/CustomAnimationEffect.cxx | 66 +--
sd/source/core/CustomAnimationPreset.cxx | 30 -
sd/source/core/EffectMigration.cxx | 6
sd/source/core/TransitionPreset.cxx | 4
sd/source/core/drawdoc.cxx | 21 -
sd/source/core/drawdoc2.cxx | 2
sd/source/core/drawdoc3.cxx | 2
sd/source/core/drawdoc4.cxx | 6
sd/source/core/sdpage.cxx | 10
sd/source/core/sdpage2.cxx | 70 ++-
sd/source/core/shapelist.cxx | 8
sd/source/core/stlpool.cxx | 110 +++--
sd/source/core/stlsheet.cxx | 4
sd/source/core/undo/undomanager.cxx | 2
sd/source/core/undoanim.cxx | 6
sd/source/filter/eppt/pptexanimations.cxx | 4
sd/source/filter/eppt/pptx-text.cxx | 2
sd/source/filter/html/buttonset.cxx | 10
sd/source/filter/html/htmlex.cxx | 2
sd/source/filter/ppt/ppt97animations.cxx | 10
sd/source/filter/ppt/pptinanimations.cxx | 24 -
sd/source/filter/ppt/propread.cxx | 6
sd/source/filter/xml/sdxmlwrp.cxx | 10
sd/source/ui/animations/CustomAnimationDialog.cxx | 2
sd/source/ui/animations/CustomAnimationList.cxx | 4
sd/source/ui/animations/CustomAnimationPane.cxx | 10
sd/source/ui/animations/STLPropertySet.cxx | 8
sd/source/ui/annotations/annotationmanager.cxx | 6
sd/source/ui/app/optsitem.cxx | 2
sd/source/ui/app/sdmod2.cxx | 2
sd/source/ui/app/sdxfer.cxx | 4
sd/source/ui/dlg/assclass.cxx | 121 ++----
sd/source/ui/dlg/dlgass.cxx | 4
sd/source/ui/dlg/filedlg.cxx | 10
sd/source/ui/dlg/masterlayoutdlg.cxx | 2
sd/source/ui/dlg/navigatr.cxx | 2
sd/source/ui/dlg/tpaction.cxx | 6
sd/source/ui/framework/tools/FrameworkHelper.cxx | 2
sd/source/ui/func/fuconarc.cxx | 2
sd/source/ui/func/fuconbez.cxx | 2
sd/source/ui/func/fuconrec.cxx | 8
sd/source/ui/func/futempl.cxx | 2
sd/source/ui/func/futext.cxx | 2
sd/source/ui/inc/assclass.hxx | 18
sd/source/ui/inc/bmcache.hxx | 54 --
sd/source/ui/inc/fuslsel.hxx | 122 ------
sd/source/ui/slideshow/slideshowimpl.cxx | 8
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 2
sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx | 4
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 2
sd/source/ui/table/TableDesignPane.cxx | 14
sd/source/ui/table/tablefunction.cxx | 2
sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 2
sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx | 2
sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx | 2
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 10
sd/source/ui/unoidl/unolayer.cxx | 16
sd/source/ui/unoidl/unomodel.cxx | 16
sd/source/ui/unoidl/unoobj.cxx | 2
sd/source/ui/unoidl/unopage.cxx | 10
sd/source/ui/unoidl/unopage.hxx | 4
sd/source/ui/unoidl/unosrch.cxx | 8
sd/source/ui/view/Outliner.cxx | 2
sd/source/ui/view/bmcache.cxx | 80 ----
sd/source/ui/view/drviews2.cxx | 4
sd/source/ui/view/drviews4.cxx | 2
sd/source/ui/view/drviewsa.cxx | 2
sd/source/ui/view/drviewsc.cxx | 2
sd/source/ui/view/frmview.cxx | 4
sd/source/ui/view/makefile.mk | 3
sd/source/ui/view/outlnvs2.cxx | 48 --
sd/source/ui/view/outlnvsh.cxx | 165 ++++----
sd/source/ui/view/outlview.cxx | 185 ++++------
sd/source/ui/view/sdview3.cxx | 2
sd/source/ui/view/zoomlist.cxx | 16
sd/uiconfig/sdraw/menubar/menubar.xml | 1
sd/uiconfig/simpress/menubar/menubar.xml | 1
80 files changed, 546 insertions(+), 900 deletions(-)
New commits:
commit 4d7f57dd653b40813f5fe3112733111396313408
Author: Xavier ALT <dex at phoenix-ind.net>
Date: Tue Mar 8 22:59:32 2011 +0100
remove SVX_LIGHT macro
diff --git a/sd/inc/pglink.hxx b/sd/inc/pglink.hxx
index 9f22e3a..a6f58b6 100644
--- a/sd/inc/pglink.hxx
+++ b/sd/inc/pglink.hxx
@@ -29,8 +29,6 @@
#ifndef _PGLINK_HXX
#define _PGLINK_HXX
-#ifndef SVX_LIGHT
-
#include <sfx2/lnkbase.hxx>
class SdPage;
@@ -51,12 +49,6 @@ public:
bool Connect() { return 0 != SvBaseLink::GetRealObject(); }
};
-#else
-
-class SdPageLink;
-
-#endif
-
#endif // _PGLINK_HXX
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index d145609..e5d3e2e 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -45,23 +45,15 @@
#include <vcl/svapp.hxx>
#include "drawdoc.hxx"
-#ifndef SVX_LIGHT
#include "DrawDocShell.hxx"
-#endif
#include "unomodel.hxx"
-#ifndef SVX_LIGHT
#include "optsitem.hxx"
#include <sfx2/printer.hxx>
#include "sdattr.hxx"
-#endif
#include "../inc/ViewShell.hxx"
#include "../inc/FrameView.hxx"
-#ifndef SVX_LIGHT
#include "Outliner.hxx"
-#else
-#include <svx/svdoutl.hxx>
-#endif
#include <editeng/editstat.hxx>
#include <svx/unoapi.hxx>
@@ -176,7 +168,6 @@ enum SdDocumentSettingsPropertyHandles
{ MAP_LEN("DefaultTabStop"), HANDLE_TABSTOP, &::getCppuType((const sal_Int32*)0), 0, 0 },
{ MAP_LEN("PrinterName"), HANDLE_PRINTERNAME, &::getCppuType((const OUString*)0), 0, 0 },
{ MAP_LEN("PrinterSetup"), HANDLE_PRINTERJOB, &::getCppuType((const uno::Sequence < sal_Int8 > *)0), 0, MID_PRINTER },
-#ifndef SVX_LIGHT
{ MAP_LEN("IsPrintPageName"), HANDLE_PRINTPAGENAME, &::getBooleanCppuType(), 0, MID_PRINTER },
{ MAP_LEN("IsPrintDate"), HANDLE_PRINTDATE, &::getBooleanCppuType(), 0, MID_PRINTER },
@@ -188,7 +179,6 @@ enum SdDocumentSettingsPropertyHandles
{ MAP_LEN("IsPrintBookletFront"), HANDLE_PRINTBOOKLETFRONT, &::getBooleanCppuType(), 0, MID_PRINTER },
{ MAP_LEN("IsPrintBookletBack"), HANDLE_PRINTBOOKLETBACK, &::getBooleanCppuType(), 0, MID_PRINTER },
{ MAP_LEN("PrintQuality"), HANDLE_PRINTQUALITY, &::getCppuType((const sal_Int32*)0), 0, MID_PRINTER },
-#endif
{ MAP_LEN("ColorTableURL"), HANDLE_COLORTABLEURL, &::getCppuType((const OUString*)0), 0, 0 },
{ MAP_LEN("DashTableURL"), HANDLE_DASHTABLEURL, &::getCppuType((const OUString*)0), 0, 0 },
{ MAP_LEN("LineEndTableURL"), HANDLE_LINEENDTABLEURL, &::getCppuType((const OUString*)0), 0, 0 },
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index 6cbec32..59c68f8 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -42,9 +42,7 @@
// folgende fuer InsertSdPage()
#include <svx/svdlayer.hxx>
-#ifndef SVX_LIGHT
#include "DrawDocShell.hxx"
-#endif
#include <drawdoc.hxx>
#include <unomodel.hxx>
#include "unoprnms.hxx"
@@ -268,10 +266,8 @@ void SAL_CALL SdLayer::setPropertyValue( const OUString& aPropertyName, const un
throw beans::UnknownPropertyException();
}
-#ifndef SVX_LIGHT
if( pLayerManager->GetDocShell() )
pLayerManager->GetDocShell()->SetModified();
-#endif
}
uno::Any SAL_CALL SdLayer::getPropertyValue( const OUString& PropertyName )
@@ -343,7 +339,6 @@ sal_Bool SdLayer::get( LayerAttribute what ) throw()
}
}
-#ifndef SVX_LIGHT
// Versuch 2. Info von der FrameView besorgen
if(pLayerManager->GetDocShell())
{
@@ -356,7 +351,6 @@ sal_Bool SdLayer::get( LayerAttribute what ) throw()
case LOCKED: return pFrameView->GetLockedLayers().IsSet(pLayer->GetID());
}
}
-#endif
}
return sal_False; //TODO: uno::Exception?
}
@@ -385,7 +379,6 @@ void SdLayer::set( LayerAttribute what, sal_Bool flag ) throw()
}
}
-#ifndef SVX_LIGHT
// Versuch 2. Info von der FrameView besorgen
if(pLayerManager->GetDocShell())
{
@@ -418,7 +411,6 @@ void SdLayer::set( LayerAttribute what, sal_Bool flag ) throw()
return;
}
}
-#endif
}
//TODO: uno::Exception?
}
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index b51c7e7..69ca12f 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -72,9 +72,7 @@
#include "ViewShell.hxx"
#include "unokywds.hxx"
#include "unopage.hxx"
-#ifndef SVX_LIGHT
#include "DrawDocShell.hxx"
-#endif
#include "helpids.h"
#include "glob.hxx"
#include "glob.hrc"
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 39bc5b0..5106d6c 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -73,9 +73,7 @@
#include <svx/svdpool.hxx>
#include <svx/svdview.hxx>
#include "View.hxx"
-#ifndef SVX_LIGHT
#include "DrawDocShell.hxx"
-#endif
#include "ViewShell.hxx"
#include "DrawViewShell.hxx"
#include "unoobj.hxx"
diff --git a/sd/source/ui/unoidl/unopage.hxx b/sd/source/ui/unoidl/unopage.hxx
index 23b2a9f..a203bf7 100644
--- a/sd/source/ui/unoidl/unopage.hxx
+++ b/sd/source/ui/unoidl/unopage.hxx
@@ -52,10 +52,6 @@ class SvxShape;
class SdrObject;
struct SfxItemPropertySimpleEntry;
-#ifdef SVX_LIGHT
-#define SvxFmDrawPage SvxDrawPage
-#endif
-
/***********************************************************************
* *
***********************************************************************/
commit 7c732ce6742d49d914be1ce15d2fe6246f1de2e9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 9 09:09:03 2011 +0000
cppcheck: this method can be const
diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
index 9c0d986..c891878 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
@@ -107,7 +107,7 @@ void MasterPageDescriptor::SetToken (MasterPageContainer::Token aToken)
-Image MasterPageDescriptor::GetPreview (MasterPageContainer::PreviewSize eSize)
+Image MasterPageDescriptor::GetPreview (MasterPageContainer::PreviewSize eSize) const
{
if (eSize == MasterPageContainer::SMALL)
return maSmallPreview;
diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx
index f89cc96..0761d49 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx
@@ -78,7 +78,7 @@ public:
@return
The returned preview may be empty.
*/
- Image GetPreview (MasterPageContainer::PreviewSize ePreviewSize);
+ Image GetPreview (MasterPageContainer::PreviewSize ePreviewSize) const;
/** Use the PreviewProvider to get access to a preview of the master
page.
commit d59a2650c95eb829e8550708f1fb9ecdd85bb477
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Mar 6 20:34:20 2011 +0000
make this dtor virtual
diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
index 5b6c17f..03260de 100644
--- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
+++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
@@ -219,7 +219,7 @@ public:
static const size_t mnInvalidId = static_cast< size_t >( -1 );
ToolPanelViewShell_Impl( ToolPanelViewShell& i_rPanelViewShell, ::Window& i_rPanelDeckParent );
- ~ToolPanelViewShell_Impl();
+ virtual ~ToolPanelViewShell_Impl();
ToolPanelViewShell& GetAntiImpl() { return m_rPanelViewShell; }
commit a0fe307e05f45501d02df9d9088dfc3da426697d
Author: Daniel Di Marco <d.dimarco at gmx.de>
Date: Sun Mar 6 15:59:13 2011 +0100
translated some comments from german to english
diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx
index 730a7e2..f1b4e09 100644
--- a/sd/source/ui/view/outlnvs2.cxx
+++ b/sd/source/ui/view/outlnvs2.cxx
@@ -83,7 +83,7 @@ namespace sd {
/*************************************************************************
|*
-|* SfxRequests fuer temporaere Funktionen
+|* SfxRequests for temporary functions
|*
\************************************************************************/
@@ -119,7 +119,7 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq)
}
else
{
- // hier den Zoom-Dialog oeffnen
+ // open the zoom dialog here
SetCurrentFunction( FuScale::Create( this, GetActiveWindow(), pOlView, GetDoc(), rReq ) );
}
Cancel();
@@ -154,7 +154,7 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq)
case SID_ZOOM_OUT:
{
SetCurrentFunction( FuZoom::Create(this, GetActiveWindow(), pOlView, GetDoc(), rReq) );
- // Beendet sich selbst, kein Cancel() notwendig!
+ // ends itself, no need for Cancel()!
rReq.Done();
}
break;
@@ -265,12 +265,12 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq)
if ( !(nCntrl & EE_CNTRL_NOCOLORS) )
{
- // Farbansicht ist eingeschaltet: ausschalten
+ // color view is enabled: disable
pOutl->SetControlWord(nCntrl | EE_CNTRL_NOCOLORS);
}
else
{
- // Farbansicht ist ausgeschaltet: einschalten
+ // color view is disabled: enable
pOutl->SetControlWord(nCntrl & ~EE_CNTRL_NOCOLORS);
}
@@ -419,35 +419,7 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq)
case SID_SET_DEFAULT:
{
- // 1. Selektion merken (kriegt die eselige EditEngine nicht selbst
- // auf die Reihe!)
- // 2. Update auf False (sonst flackert's noch staerker
- // an allen selektierten Absaetzen:
- // a. deren Vorlage nochmal setzen, um absatzweite harte Attribute
- // zu entfernen
- // b. harte Zeichenattribute loeschen
- // 3. Update auf True und Selektion wieder setzen
- /*
- ESelection aEsel= pOutlinerView->GetSelection();
- Outliner* pOutl = pOutlinerView->GetOutliner();
- pOutl->SetUpdateMode(FALSE);
- List* pSelectedParas = pOutlinerView->CreateSelectionList();
- Paragraph* pPara = (Paragraph*)pSelectedParas->First();
- while (pPara)
- {
- ULONG nParaPos = pOutl->GetAbsPos(pPara);
- String aName;
- SfxStyleFamily aFamily;
- pOutl->GetStyleSheet(nParaPos, aName, aFamily);
- pOutl->SetStyleSheet(nParaPos, aName, aFamily);
- pOutl->QuickRemoveCharAttribs(nParaPos);
- pPara = (Paragraph*)pSelectedParas->Next();
- }
- delete pSelectedParas;
- pOutl->SetUpdateMode(TRUE);
- pOutlinerView->SetSelection(aEsel);
- */
- pOutlinerView->RemoveAttribs(TRUE); // TRUE = auch Absatzattribute
+ pOutlinerView->RemoveAttribs(TRUE); // TRUE = also paragraph attributes
Cancel();
rReq.Done();
}
@@ -547,7 +519,7 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq)
pOldFldItem->GetField()->ISA( SvxPageField ) ||
pOldFldItem->GetField()->ISA( SvxPagesField )) )
{
- // Feld selektieren, so dass es beim Insert geloescht wird
+ // select field, so it gets deleted on Insert
ESelection aSel = pOutlinerView->GetSelection();
if( aSel.nStartPos == aSel.nEndPos )
aSel.nEndPos++;
@@ -582,8 +554,8 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq)
if( pField )
{
SvxFieldItem aFieldItem( *pField, EE_FEATURE_FIELD );
- //pOLV->DeleteSelected(); <-- fehlt leider !
- // Feld selektieren, so dass es beim Insert geloescht wird
+ //pOLV->DeleteSelected(); <-- unfortunately missing!
+ // select field, so it gets deleted on Insert
ESelection aSel = pOutlinerView->GetSelection();
BOOL bSel = TRUE;
if( aSel.nStartPos == aSel.nEndPos )
@@ -595,7 +567,7 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq)
pOutlinerView->InsertField( aFieldItem );
- // Selektion wird wieder in den Ursprungszustand gebracht
+ // reset selection to original state
if( !bSel )
aSel.nEndPos--;
pOutlinerView->SetSelection( aSel );
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index c0f2d54..e14a166 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -106,15 +106,15 @@ using namespace sd;
namespace sd {
-#define MIN_ZOOM 10 // Minimaler Zoomfaktor
-#define MAX_ZOOM 1000 // Maximaler Zoomfaktor
+#define MIN_ZOOM 10 // minimum zoom factor
+#define MAX_ZOOM 1000 // maximum zoom factor
/************************************************************************/
/*************************************************************************
|*
-|* SFX-Slotmap und Standardinterface deklarieren
+|* Declare SFX-Slotmap and standard interface
|*
\************************************************************************/
@@ -139,7 +139,7 @@ TYPEINIT1( OutlineViewShell, ViewShell );
/*************************************************************************
|*
-|* gemeinsamer Initialiserungsanteil der beiden Konstruktoren
+|* common initialization part of both constructors
|*
\************************************************************************/
@@ -156,13 +156,13 @@ void OutlineViewShell::Construct(DrawDocShell* )
GetActiveWindow()->SetMaxZoom( MAX_ZOOM );
InitWindows(aViewOrigin, aSize, aWinPos);
pOlView = new OutlineView(GetDocSh(), GetActiveWindow(), this);
- mpView = pOlView; // Pointer der Basisklasse ViewShell
+ mpView = pOlView; // Pointer of base class ViewShell
SetPool( &GetDoc()->GetPool() );
SetZoom(69);
- // Einstellungen der FrameView uebernehmen
+ // Apply settings of FrameView
ReadFrameViewData(mpFrameView);
::Outliner* pOutl = pOlView->GetOutliner();
@@ -208,7 +208,7 @@ Reference<drawing::XDrawSubController> OutlineViewShell::CreateSubController (vo
/*************************************************************************
|*
-|* Standard-Konstruktor, Fenster duerfen nicht automatisch zentrieren
+|* Default constructor, windows must not center themselves automatically
|*
\************************************************************************/
@@ -237,7 +237,7 @@ OutlineViewShell::OutlineViewShell (
/*************************************************************************
|*
-|* Destruktor
+|* Destructor
|*
\************************************************************************/
@@ -272,8 +272,8 @@ void OutlineViewShell::Shutdown (void)
/*************************************************************************
|*
-|* Paint-Methode: das Ereignis wird vom Fenster pWindow an
-|* die Viewshell und die aktuelle Funktion weitergeleitet
+|* Paint method: the event gets forwarded from pWindow to the Viewshell
+|* and the current function
|*
\************************************************************************/
@@ -307,7 +307,7 @@ void OutlineViewShell::ArrangeGUIElements ()
pWindow->SetMinZoomAutoCalc(FALSE);
- // OutputArea der OutlinerView aendern
+ // change OuputArea of the OutlinerView
OutlinerView* pOutlinerView = pOlView->GetViewByWindow(pWindow);
Rectangle aWin(Point(0,0), pWindow->GetOutputSizePixel());
@@ -322,7 +322,7 @@ void OutlineViewShell::ArrangeGUIElements ()
pOlView->GetOutliner()->GetTextHeight()));
aText.Bottom() += aWin.GetHeight();
- if (!aWin.IsEmpty()) // nicht beim Oeffnen
+ if (!aWin.IsEmpty()) // not when opening
{
InitWindows(Point(0,0), aText.GetSize(), Point(aVis.TopLeft()));
UpdateScrollBars();
@@ -332,7 +332,7 @@ void OutlineViewShell::ArrangeGUIElements ()
/*************************************************************************
|*
-|* SfxRequests fuer Controller bearbeiten
+|* Handle SfxRequest for the Controller
|*
\************************************************************************/
@@ -381,7 +381,7 @@ void OutlineViewShell::RemoveWindow (::sd::Window* pWin)
/*************************************************************************
|*
-|* Activate(), beim ersten Aufruf erfolgt ein Update der Felder
+|* Activate(): during the first invocation the fields get updated
|*
\************************************************************************/
void OutlineViewShell::Activate( BOOL bIsMDIActivate )
@@ -421,7 +421,7 @@ void OutlineViewShell::Deactivate( BOOL bIsMDIActivate )
/*************************************************************************
|*
-|* Status von Controller-SfxSlots setzen
+|* Set status of Controller-SfxSlots
|*
\************************************************************************/
void OutlineViewShell::GetCtrlState(SfxItemSet &rSet)
@@ -485,7 +485,7 @@ void OutlineViewShell::GetCtrlState(SfxItemSet &rSet)
/*************************************************************************
|*
-|* SfxRequests fuer Support-Funktionen
+|* SfxRequests for support functions
|*
\************************************************************************/
@@ -609,7 +609,6 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq)
{
if (mpZoomList->IsPreviousPossible())
{
- // Vorheriges ZoomRect einstellen
SetZoomRect(mpZoomList->GetPreviousZoomRect());
}
rReq.Done ();
@@ -620,7 +619,6 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq)
{
if (mpZoomList->IsNextPossible())
{
- // Naechstes ZoomRect einstellen
SetZoomRect(mpZoomList->GetNextZoomRect());
}
rReq.Done ();
@@ -717,7 +715,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq)
/*************************************************************************
|*
-|* SfxRequests fuer permanente Funktionen
+|* SfxRequests for permanent functions
|*
\************************************************************************/
@@ -782,7 +780,7 @@ IMPL_LINK( OutlineViewShell, ClipboardChanged, TransferableDataHelper*, pDataHel
/*************************************************************************
|*
-|* Status (Enabled/Disabled) von Menue-SfxSlots setzen
+|* Set Status (Enabled/Disabled) of Menu-SfxSlots
|*
\************************************************************************/
@@ -790,7 +788,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
{
ViewShell::GetMenuState(rSet);
- // Vorlagenkatalog darf nicht aufgerufen werden
+ // Style catalog must not be called
rSet.DisableItem( SID_STYLE_CATALOG );
rSet.Put(SfxBoolItem(SID_DIAMODE, FALSE));
@@ -822,7 +820,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
if( !pOutl )
return;
- // 'Alles auswaehlen' zulassen?
+ // allow 'Select All'?
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_SELECTALL ) )
{
ULONG nParaCount = pOutl->GetParagraphCount();
@@ -839,17 +837,17 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
rSet.DisableItem(SID_SELECTALL);
}
- // Status des Lineals setzen
+ // set status of Ruler
rSet.Put( SfxBoolItem( SID_RULER, HasRuler() ) );
- // Formatierung ein oder aus?
+ // Enable formatting?
rSet.Put( SfxBoolItem( SID_OUTLINE_FORMAT, !pOutl->IsFlatMode() ) );
if( pOutl->IsFlatMode() )
rSet.DisableItem( SID_COLORVIEW );
else
{
- // Farbansicht ein/aus
+ // Enable color view?
ULONG nCntrl = pOutl->GetControlWord();
BOOL bNoColor = FALSE;
if (nCntrl & EE_CNTRL_NOCOLORS)
@@ -858,8 +856,8 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
rSet.Put( SfxBoolItem( SID_COLORVIEW, bNoColor ) );
}
- // Buttons der Werkzeugleiste
- // zunaechst selektionsabhaengige: COLLAPSE, EXPAND
+ // Buttons of toolbar
+ // first the selection dependent ones: COLLAPSE, EXPAND
BOOL bDisableCollapse = TRUE;
BOOL bDisableExpand = TRUE;
BOOL bUnique = TRUE;
@@ -893,8 +891,8 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
if (bDisableCollapse)
rSet.DisableItem(SID_OUTLINE_COLLAPSE);
- // ergibt die Selektion ein eindeutiges Praesentationslayout?
- // wenn nicht, duerfen die Vorlagen nicht bearbeitet werden
+ // does the selection provide a unique presentation layout?
+ // if not, the templates must not be edited
SfxItemSet aSet(*rSet.GetPool(), SID_STATUS_LAYOUT, SID_STATUS_LAYOUT);
GetStatusBarState(aSet);
String aTest(((SfxStringItem&)aSet.Get(SID_STATUS_LAYOUT)).GetValue());
@@ -907,17 +905,17 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
if (!bUnique)
rSet.DisableItem( SID_PRESENTATIONOBJECT );
- // jetzt die selektionsunabhaengigen: COLLAPSE_ALL, EXPAND_ALL
+ // now the selection independent ones: COLLAPSE_ALL, EXPAND_ALL
BOOL bDisableCollapseAll = TRUE;
BOOL bDisableExpandAll = TRUE;
- // wenn schon die Selektion etwas kollabierbares/expandierbares enthaelt
+ // does the selection contain something collapsable/expandable?
if (!bDisableCollapse)
bDisableCollapseAll = FALSE;
if (!bDisableExpand)
bDisableExpandAll = FALSE;
- // schade, so billig kommen wir nicht davon; alle Absaetze durchsuchen
+ // otherwise look through all paragraphs
if (bDisableCollapseAll || bDisableExpandAll)
{
ULONG nParaPos = 0;
@@ -973,7 +971,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
GetDoc()->SetChanged(TRUE);
}
- // Da ueberladen, muss hier der Status gesetzt werden
+ // the status has to be set here because of overloading
if( !GetDocSh()->IsModified() )
{
rSet.DisableItem( SID_SAVEDOC );
@@ -995,7 +993,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
}
}
- // Feldbefehle
+ // field commands
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_MODIFY_FIELD ) )
{
const SvxFieldItem* pFldItem = pOutlinerView->GetFieldAtSelection();
@@ -1088,7 +1086,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
}
}
- // Starten der Praesentation moeglich?
+ // is starting the presentation possible?
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PRESENTATION ) )
{
BOOL bDisable = TRUE;
@@ -1113,7 +1111,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
/*************************************************************************
|*
-|* wird gerufen, wenn ScrollBar benutzt wird
+|* gets invoked when ScrollBar is used
|*
\************************************************************************/
@@ -1141,12 +1139,6 @@ long OutlineViewShell::VirtHScrollHdl(ScrollBar* pHScroll)
return 0;
}
-/*************************************************************************
-|*
-|* wird gerufen, wenn ScrollBar benutzt wird
-|*
-\************************************************************************/
-
long OutlineViewShell::VirtVScrollHdl(ScrollBar* pVScroll)
{
long nThumb = pVScroll->GetThumbPos();
@@ -1174,8 +1166,8 @@ long OutlineViewShell::VirtVScrollHdl(ScrollBar* pVScroll)
/*************************************************************************
|*
-|* PrepareClose, wird gerufen, wenn die Shell zestoert werden soll,
-|* leitet den Aufruf an die View weiter
+|* PrepareClose, gets called when the Shell shall be destroyed.
+|* Forwards the invocation to the View
|*
\************************************************************************/
@@ -1190,7 +1182,7 @@ USHORT OutlineViewShell::PrepareClose( BOOL bUI, BOOL bForBrowsing )
/*************************************************************************
|*
-|* Zoomen mit Zoomfaktor, OutlinerView informieren
+|* Zoom with zoom factor. Inform OutlinerView
|*
\************************************************************************/
@@ -1201,7 +1193,7 @@ void OutlineViewShell::SetZoom(long nZoom)
::sd::Window* pWindow = mpContentWindow.get();
if (pWindow)
{
- // OutputArea der OutlinerView aendern
+ // change OutputArea of OutlinerView
OutlinerView* pOutlinerView = pOlView->GetViewByWindow(pWindow);
Rectangle aWin(Point(0,0), pWindow->GetOutputSizePixel());
aWin = pWindow->PixelToLogic(aWin);
@@ -1214,7 +1206,7 @@ void OutlineViewShell::SetZoom(long nZoom)
/*************************************************************************
|*
-|* Zoomen mit Zoomrechteck, OutlinerView informieren
+|* Zoom with zoom rectangle. Inform OutlinerView
|*
\************************************************************************/
@@ -1225,7 +1217,7 @@ void OutlineViewShell::SetZoomRect(const Rectangle& rZoomRect)
::sd::Window* pWindow = mpContentWindow.get();
if (pWindow)
{
- // OutputArea der OutlinerView aendern
+ // change OutputArea of OutlinerView
OutlinerView* pOutlinerView = pOlView->GetViewByWindow(pWindow);
Rectangle aWin(Point(0,0), pWindow->GetOutputSizePixel());
aWin = pWindow->PixelToLogic(aWin);
@@ -1238,8 +1230,8 @@ void OutlineViewShell::SetZoomRect(const Rectangle& rZoomRect)
/*************************************************************************
|*
-|* Vorm Speichern das Model der Drawing Engine aktualisieren, dann den
-|* Call weiterleiten an die ObjectShell.
+|* Before saving: Update Model of the Drawing Engine, then forward the
+|* invocation to the ObjectShell.
|*
\************************************************************************/
@@ -1299,16 +1291,16 @@ void OutlineViewShell::ReadFrameViewData(FrameView* pView)
::Outliner* pOutl = pOlView->GetOutliner();
if ( pView->IsNoAttribs() )
- pOutl->SetFlatMode( TRUE ); // Attribut-Darstellung ausschalten
+ pOutl->SetFlatMode( TRUE );
else
- pOutl->SetFlatMode( FALSE ); // Attribut-Darstellung einschalten
+ pOutl->SetFlatMode( FALSE );
ULONG nCntrl = pOutl->GetControlWord();
if ( pView->IsNoColors() )
- pOutl->SetControlWord(nCntrl | EE_CNTRL_NOCOLORS); // Farbansicht ausschalten
+ pOutl->SetControlWord(nCntrl | EE_CNTRL_NOCOLORS);
else
- pOutl->SetControlWord(nCntrl & ~EE_CNTRL_NOCOLORS); // Farbansicht einschalten
+ pOutl->SetControlWord(nCntrl & ~EE_CNTRL_NOCOLORS);
USHORT nPage = mpFrameView->GetSelectedPage();
pLastPage = GetDoc()->GetSdPage( nPage, PK_STANDARD );
@@ -1342,7 +1334,7 @@ void OutlineViewShell::WriteFrameViewData()
/*************************************************************************
|*
-|* SfxRequests fuer StatusBar bearbeiten
+|* Handle SfxRequests for the StatusBar
|*
\************************************************************************/
@@ -1352,7 +1344,7 @@ void OutlineViewShell::ExecStatusBar(SfxRequest&)
/*************************************************************************
|*
-|* Statuswerte der Statusbar zurueckgeben
+|* Return state values of the StatusBar
|*
\************************************************************************/
@@ -1366,7 +1358,7 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet)
pZoomItem = new SvxZoomItem( SVX_ZOOM_PERCENT, nZoom );
- // Bereich einschraenken
+ // limit area
USHORT nZoomValues = SVX_ZOOM_ENABLE_ALL;
nZoomValues &= ~SVX_ZOOM_ENABLE_OPTIMAL;
nZoomValues &= ~SVX_ZOOM_ENABLE_WHOLEPAGE;
@@ -1393,7 +1385,7 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet)
}
- // Seitenanzeige und Layout
+ // page view and layout
USHORT nPageCount = GetDoc()->GetSdPageCount( PK_STANDARD );
String aPageStr, aLayoutStr;
@@ -1411,12 +1403,12 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet)
if( !pOutliner->HasParaFlag(pLastPara, PARAFLAG_ISPAGE) )
pLastPara = pOlView->GetPrevTitle( pLastPara );
- delete pSelList; // die wurde extra fuer uns erzeugt
+ delete pSelList; // has been created only for us
- // nur eine Seite selektiert?
+ // only one page selected?
if( pFirstPara == pLastPara )
{
- // wieviele Seiten sind vor der selektierten Seite?
+ // how many pages are we before the selected page?
ULONG nPos = 0L;
while( pFirstPara )
{
@@ -1474,7 +1466,7 @@ void OutlineViewShell::Command( const CommandEvent& rCEvt, ::sd::Window* pWin )
{
ViewShell::Command( rCEvt, pWin );
- // ggfs. Preview den neuen Kontext mitteilen
+ // if necessary communicate the new context to the Preview
Invalidate( SID_PREVIEW_STATE );
}
@@ -1497,7 +1489,7 @@ BOOL OutlineViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin)
bReturn = GetCurrentFunction()->KeyInput(rKEvt);
}
- // nein, weiterleiten an Basisklasse
+ // no, forward to base class
else
{
bReturn = ViewShell::KeyInput(rKEvt, pWin);
@@ -1511,7 +1503,7 @@ BOOL OutlineViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin)
Invalidate(SID_STYLE_WATERCAN);
Invalidate(SID_STYLE_FAMILY5);
- // Pruefen und Unterscheiden von CursorBewegungs- oder Eingabe-Keys
+ // check and distinguish cursor movements- or input-keys
KeyCode aKeyGroup( rKEvt.GetKeyCode().GetGroup() );
if( (aKeyGroup != KEYGROUP_CURSOR && aKeyGroup != KEYGROUP_FKEYS) ||
(GetActualPage() != pLastPage) )
@@ -1525,7 +1517,7 @@ BOOL OutlineViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin)
/*************************************************************************
|*
-|* Optimale Groesse zurueckgeben
+|* Return optimal Size
|*
\************************************************************************/
@@ -1548,7 +1540,7 @@ Size OutlineViewShell::GetOptimalSizePixel() const
}
}
- // und jetzt jetzt das Standardgelumpe draufaddieren
+ // now add the default stuff
aResult.Width() += mpVerticalScrollBar->GetSizePixel().Width();
aResult.Height() += mpHorizontalScrollBar->GetSizePixel().Height();
return aResult;
@@ -1557,7 +1549,7 @@ Size OutlineViewShell::GetOptimalSizePixel() const
/*************************************************************************
|*
-|* Text der Selektion zurueckgeben
+|* Return text of the selection
|*
\************************************************************************/
@@ -1590,7 +1582,7 @@ String OutlineViewShell::GetSelectionText(BOOL bCompleteWords)
/*************************************************************************
|*
-|* Ist etwas selektiert?
+|* Is something selected?
|*
\************************************************************************/
@@ -1614,7 +1606,7 @@ BOOL OutlineViewShell::HasSelection(BOOL bText) const
/*************************************************************************
|*
-|* Status der Attribut-Items
+|* Status of Attribute-Items
|*
\************************************************************************/
@@ -1675,7 +1667,7 @@ void OutlineViewShell::GetAttrState( SfxItemSet& rSet )
if (!aRealStyle.Len())
{
- // Kein eindeutiger Layoutname gefunden
+ // no unique layout name found
rSet.DisableItem(nWhich);
}
}
@@ -1690,8 +1682,8 @@ void OutlineViewShell::GetAttrState( SfxItemSet& rSet )
if (aESel.nStartPara != aESel.nEndPara ||
aESel.nStartPos != aESel.nEndPos)
- // aufgespannte Selektion, also StyleSheet und/oder
- // Attributierung nicht zwingend eindeutig
+ // spanned selection, i.e. StyleSheet and/or
+ // attribution not necessarily unqiue
rSet.DisableItem(nWhich);
}
break;
@@ -1722,7 +1714,7 @@ void OutlineViewShell::GetAttrState( SfxItemSet& rSet )
void OutlineViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin)
{
- // Zuerst die Basisklasse
+ // first the base classes
ViewShell::MouseButtonUp(rMEvt, pWin);
Invalidate(SID_STYLE_EDIT);
@@ -1733,7 +1725,7 @@ void OutlineViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin
Invalidate(SID_STYLE_WATERCAN);
Invalidate(SID_STYLE_FAMILY5);
- // ggfs. Preview den neuen Kontext mitteilen
+ // if necessary communicate the new context to the Preview
if( GetActualPage() != pLastPage )
Invalidate( SID_PREVIEW_STATE );
}
@@ -1749,8 +1741,8 @@ SdPage* OutlineViewShell::getCurrentPage() const
/*************************************************************************
|*
-|* Liefert die erste selektierte Seite zurueck.
-|* Wenn nichts selektiert ist, wird die erste Seite zurueckgeliefert.
+|* Returns the first selected page.
+|* If nothing is selected, the first page is returned.
|*
\************************************************************************/
SdPage* OutlineViewShell::GetActualPage()
@@ -1851,7 +1843,7 @@ String OutlineViewShell::GetPageRangeString()
if( nPageCount == 0 )
aStrPageRange.Erase();
- delete pSelList; // die wurde extra fuer uns erzeugt
+ delete pSelList; // has been created only for us
return aStrPageRange;
}
@@ -1982,7 +1974,7 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara )
pTO = pOlView->GetOutlineTextObject( pPage );
}
- // wieviele Absaetze in der Gliederung?
+ // how many paragraphs in the outline?
ULONG nTitlePara = pOutliner->GetAbsPos( pPara );
ULONG nPara = nTitlePara + 1;
ULONG nParasInLayout = 0L;
@@ -1994,7 +1986,7 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara )
}
if( nParasInLayout )
{
- // ein OutlinerParaObject erzeugen
+ // create an OutlinerParaObject
pPara = pOutliner->GetParagraph( nTitlePara + 1 );
pOPO = pOutliner->CreateParaObject( (USHORT) nTitlePara + 1, (USHORT) nParasInLayout );
}
@@ -2010,8 +2002,8 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara )
bNewObject = TRUE;
}
- // Seitenobjekt, Gliederungstext im Outliner:
- // Text uebernehmen
+ // page object, outline text in Outliner:
+ // apply text
if( pTO )
{
pOPO->SetVertical( pTO->IsVerticalWriting() );
@@ -2034,16 +2026,17 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara )
}
else if( pTO )
{
- // Seitenobjekt, aber kein Gliederungstext:
- // wenn Objekt in Praesentationsliste der Seite ist -> Defaulttext,
- // sonst Objekt loeschen
+ // page object but no outline text:
+ // if the object is in the outline of the page -> default text
+
+ // otherwise delete object
if( pPage->IsPresObj(pTO) )
{
if( !pTO->IsEmptyPresObj() )
{
DBG_ASSERT( pOlView->isRecordingUndo(), "sd::OutlineViewShell::UpdateOutlineObject(), no undo for model change!?" );
- // loescht auch altes OutlinerParaObject
+ // delete old OutlinerParaObject, too
if( pOlView->isRecordingUndo() )
pOlView->AddUndo(GetDoc()->GetSdrUndoFactory().CreateUndoObjectSetText(*pTO,0));
pPage->RestoreDefaultText( pTO );
@@ -2066,7 +2059,7 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara )
/*************************************************************************
|*
-|* Outliner aus Stream fuellen
+|* Fill Outliner from Stream
|*
\************************************************************************/
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index fea4edf..1dbd13c 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -88,11 +88,11 @@ using namespace ::com::sun::star::frame;
namespace sd {
-// Breite: DIN A 4, zwei Raender zu je 1 cm
+// width: DIN A4, two margins à 1 cm each
#define OUTLINE_PAPERWIDTH 19000
-// beim Seitenmanipulation Fortschrittsanzeige, wenn mehr Seiten betroffen
-// sind als:
+// a progress bar gets displayed when more than
+// PROCESS_WITH_PROGRESS_THRESHOLD pages are concerned
#define PROCESS_WITH_PROGRESS_THRESHOLD 5
struct SdParaAndPos
@@ -105,7 +105,7 @@ TYPEINIT1( OutlineView, ::sd::View );
/*************************************************************************
|*
-|* Konstruktor
+|* Constructor
|*
\************************************************************************/
@@ -127,7 +127,7 @@ OutlineView::OutlineView( DrawDocShell* pDocSh, ::Window* pWindow, OutlineViewSh
if (mpOutliner->GetViewCount() == 0)
{
- // Outliner initialisieren: Referenz-Device setzen
+ // initialize Outliner: set Reference Device
bInitOutliner = TRUE;
mpOutliner->Init( OUTLINERMODE_OUTLINEVIEW );
mpOutliner->SetRefDevice( SD_MOD()->GetRefDevice( *pDocSh ) );
@@ -135,7 +135,7 @@ OutlineView::OutlineView( DrawDocShell* pDocSh, ::Window* pWindow, OutlineViewSh
mpOutliner->SetPaperSize(Size(nWidth, 400000000));
}
- // View in Outliner einfuegen
+ // insert View into Outliner
for (USHORT nView = 0; nView < MAX_OUTLINERVIEWS; nView++)
{
mpOutlinerView[nView] = NULL;
@@ -151,7 +151,7 @@ OutlineView::OutlineView( DrawDocShell* pDocSh, ::Window* pWindow, OutlineViewSh
if (bInitOutliner)
{
- // Outliner mit Inhalt fuellen
+ // fill Outliner with contents
FillOutliner();
}
@@ -191,7 +191,7 @@ OutlineView::OutlineView( DrawDocShell* pDocSh, ::Window* pWindow, OutlineViewSh
/*************************************************************************
|*
-|* Destruktor, Links restaurieren, Outliner leeren
+|* Destructor, restore Links, clear Oultiner
|*
\************************************************************************/
@@ -206,7 +206,7 @@ OutlineView::~OutlineView()
if( mpProgress )
delete mpProgress;
- // OutlinerViews abmelden und zerstoeren
+ // unregister OutlinerViews and destroy them
for (USHORT nView = 0; nView < MAX_OUTLINERVIEWS; nView++)
{
if (mpOutlinerView[nView] != NULL)
@@ -219,10 +219,10 @@ OutlineView::~OutlineView()
if (mpOutliner->GetViewCount() == 0)
{
- // Outliner deinitialisieren: Farbdarstellung einschalten
+ // uninitialize Outliner: enable color display
ResetLinks();
ULONG nCntrl = mpOutliner->GetControlWord();
- mpOutliner->SetUpdateMode(FALSE); // sonst wird bei SetControlWord gezeichnet
+ mpOutliner->SetUpdateMode(FALSE); // otherwise there will be drawn on SetControlWord
mpOutliner->SetControlWord(nCntrl & ~EE_CNTRL_NOCOLORS);
SvtAccessibilityOptions aOptions;
mpOutliner->ForceAutoColor( aOptions.GetIsAutomaticFontColor() );
@@ -255,7 +255,7 @@ void OutlineView::DisconnectFromApplication (void)
/*************************************************************************
|*
-|* Paint-Methode
+|* Paint method
|*
\************************************************************************/
@@ -280,7 +280,7 @@ void OutlineView::InvalidateSlideNumberArea()
/*************************************************************************
|*
-|* Fenster-Groesse hat sich geaendert
+|* Window size was changed
|*
\************************************************************************/
@@ -290,7 +290,7 @@ void OutlineView::AdjustPosSizePixel(const Point &,const Size &,::sd::Window*)
/*************************************************************************
|*
-|* ein Fenster hinzufuegen
+|* add a window
|*
\************************************************************************/
@@ -325,7 +325,7 @@ void OutlineView::AddWindowToPaintView(OutputDevice* pWin)
nView++;
}
- // weisser Hintergrund im Outliner
+ // white background in Outliner
pWin->SetBackground( Wallpaper( aWhiteColor ) );
::sd::View::AddWindowToPaintView(pWin);
@@ -333,7 +333,7 @@ void OutlineView::AddWindowToPaintView(OutputDevice* pWin)
/*************************************************************************
|*
-|* ein Fenster entfernen
+|* remove a window
|*
\************************************************************************/
@@ -366,7 +366,7 @@ void OutlineView::DeleteWindowFromPaintView(OutputDevice* pWin)
/*************************************************************************
|*
-|* Zeiger der dem Fenster entsprechenden OutlinerView zurueckgeben.
+|* Return a pointer to the OutlinerView corresponding to the window
|*
\************************************************************************/
@@ -389,7 +389,7 @@ OutlinerView* OutlineView::GetViewByWindow (::Window* pWin) const
/*************************************************************************
|*
-|* Ermittelt den Titel vor einem beliebigen Absatz.
+|* Return the title before a random paragraph
|*
\************************************************************************/
@@ -414,7 +414,7 @@ Paragraph* OutlineView::GetPrevTitle(const Paragraph* pPara)
/*************************************************************************
|*
-|* Ermittelt den Titel nach einem beliebigen Absatz.
+|* Return the title after a random paragraph
|*
\************************************************************************/
@@ -437,14 +437,12 @@ Paragraph* OutlineView::GetNextTitle(const Paragraph* pPara)
/*************************************************************************
|*
-|* Handler fuer das Einfuegen von Seiten (Absaetzen)
+|* Handler for inserting pages (paragraphs)
|*
\************************************************************************/
IMPL_LINK( OutlineView, ParagraphInsertedHdl, ::Outliner *, pOutliner )
{
-// DBG_ASSERT( isRecordingUndo(), "sd::OutlineView::ParagraphInsertedHdl(), model change without undo?!" );
-
// we get calls to this handler during binary insert of drag and drop contents but
// we ignore it here and handle it later in OnEndPasteOrDrop()
if( maDragAndDropModelGuard.get() == 0 )
@@ -475,9 +473,9 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara )
OutlineViewPageChangesGuard aGuard(this);
mpOutliner->SetParaFlag( pPara, PARAFLAG_ISPAGE );
- // wieviele Titel sind vor dem neuen Titelabsatz?
- ULONG nExample = 0L; // Position der "Vorbild"seite
- ULONG nTarget = 0L; // Einfuegeposition
+ // how many titles are there before the new title paragraph?
+ ULONG nExample = 0L; // position of the "example" page
+ ULONG nTarget = 0L; // position of insertion
while(pPara)
{
pPara = GetPrevTitle(pPara);
@@ -485,11 +483,9 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara )
nTarget++;
}
-
- // was der Outliner nicht kann, muss hier wieder wettgemacht werden:
- // wenn VOR dem ersten Absatz ein neuer Absatz mit RETURN erzeugt wird,
- // meldet der Outliner den bereits bestehenden (jetzt nach unten
- // gerutschten) Absatz als neuen Absatz; nicht darauf reinfallen!
+ // if a new paragraph is created via RETURN before the first paragraph, the
+ // Outliner reports the old paragraph (which was moved down) as a new
+ // paragraph
if (nTarget == 1)
{
String aTest(mpOutliner->GetText( mpOutliner->GetParagraph( 0 ) ));
@@ -500,7 +496,7 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara )
}
- // "Vorbild"seite ist - wenn vorhanden - die Vorgaengerseite
+ // the "example" page is the previous page - if it is available
if (nTarget > 0)
{
nExample = nTarget - 1;
@@ -511,36 +507,35 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara )
}
/**********************************************************************
- * Es wird stets zuerst eine Standardseite und dann eine
- * Notizseite erzeugt. Es ist sichergestellt, dass auf eine
- * Standardseite stets die zugehoerige Notizseite folgt.
- * Vorangestellt ist genau eine Handzettelseite
+ * All the time, a standard page is created before a notes page.
+ * It is ensured that after each standard page the corresponding notes page
+ * follows. A handout page is exactly one handout page.
**********************************************************************/
- // diese Seite hat Vorbildfunktion
+ // this page is exemplary
SdPage* pExample = (SdPage*)mpDoc->GetSdPage((USHORT)nExample, PK_STANDARD);
SdPage* pPage = (SdPage*)mpDoc->AllocPage(FALSE);
pPage->SetLayoutName(pExample->GetLayoutName());
- // einfuegen (Seite)
+ // insert (page)
mpDoc->InsertPage(pPage, (USHORT)(nTarget) * 2 + 1);
if( isRecordingUndo() )
AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoNewPage(*pPage));
- // der Standardseite eine Masterpage zuweisen
+ // assign a master page to the standard page
pPage->TRG_SetMasterPage(pExample->TRG_GetMasterPage());
- // Seitengroesse setzen
+ // set page size
pPage->SetSize(pExample->GetSize());
pPage->SetBorder( pExample->GetLftBorder(),
pExample->GetUppBorder(),
pExample->GetRgtBorder(),
pExample->GetLwrBorder() );
- // neue Praesentationsobjekte anlegen (auf <Titel> oder
- // <Titel mit Untertitel> folgt <Titel mit Gliederung>, ansonsten
- // wird das Layout von der Vorgaengerseite uebernommen)
+ // create new presentation objects (after <Title> or <Title with subtitle>
+ // follows <Title with outline>, otherwise apply the layout of the previous
+ // page
AutoLayout eAutoLayout = pExample->GetAutoLayout();
if (eAutoLayout == AUTOLAYOUT_TITLE ||
eAutoLayout == AUTOLAYOUT_ONLY_TITLE)
@@ -553,7 +548,7 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara )
}
/**********************************************************************
- |* jetzt die Notizseite
+ |* now the notes page
\*********************************************************************/
pExample = (SdPage*)mpDoc->GetSdPage((USHORT)nExample, PK_NOTES);
SdPage* pNotesPage = (SdPage*)mpDoc->AllocPage(FALSE);
@@ -562,22 +557,22 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara )
pNotesPage->SetPageKind(PK_NOTES);
- // einfuegen (Notizseite)
+ // insert (notes page)
mpDoc->InsertPage(pNotesPage, (USHORT)(nTarget) * 2 + 2);
if( isRecordingUndo() )
AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoNewPage(*pNotesPage));
- // der Notizseite eine Masterpage zuweisen
+ // assign a master page to the notes page
pNotesPage->TRG_SetMasterPage(pExample->TRG_GetMasterPage());
- // Seitengroesse setzen, es muss bereits eine Seite vorhanden sein
+ // set page size, there must be already one page available
pNotesPage->SetSize(pExample->GetSize());
pNotesPage->SetBorder( pExample->GetLftBorder(),
pExample->GetUppBorder(),
pExample->GetRgtBorder(),
pExample->GetLwrBorder() );
- // neue Praesentationsobjekte anlegen
+ // create presentation objects
pNotesPage->SetAutoLayout(pExample->GetAutoLayout(), TRUE);
mpOutliner->UpdateFields();
@@ -587,7 +582,7 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara )
/*************************************************************************
|*
-|* Handler fuer das Loeschen von Seiten (Absaetzen)
+|* Handler for deleting pages (paragraphs)
|*
\************************************************************************/
@@ -600,7 +595,7 @@ IMPL_LINK( OutlineView, ParagraphRemovingHdl, ::Outliner *, pOutliner )
Paragraph* pPara = pOutliner->GetHdlParagraph();
if( pOutliner->HasParaFlag( pPara, PARAFLAG_ISPAGE ) )
{
- // wieviele Titel sind vor dem fraglichen Titelabsatz?
+ // how many titles are in front of the title paragraph in question?
ULONG nPos = 0L;
while(pPara)
{
@@ -608,7 +603,7 @@ IMPL_LINK( OutlineView, ParagraphRemovingHdl, ::Outliner *, pOutliner )
if (pPara) nPos++;
}
- // Seite und Notizseite loeschen
+ // delete page and notes page
USHORT nAbsPos = (USHORT)nPos * 2 + 1;
SdrPage* pPage = mpDoc->GetPage(nAbsPos);
if( isRecordingUndo() )
@@ -621,7 +616,7 @@ IMPL_LINK( OutlineView, ParagraphRemovingHdl, ::Outliner *, pOutliner )
AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoDeletePage(*pPage));
mpDoc->RemovePage(nAbsPos);
- // ggfs. Fortschrittsanzeige
+ // progress display if necessary
if (mnPagesToProcess)
{
mnPagesProcessed++;
@@ -650,8 +645,8 @@ IMPL_LINK( OutlineView, ParagraphRemovingHdl, ::Outliner *, pOutliner )
/*************************************************************************
|*
-|* Handler fuer das Aendern der Einruecktiefe von Absaetzen (macht ggfs.
-|* das Einfuegen oder Loeschen von Seiten notwendig)
+|* Handler for changing the indentation depth of paragraphs (requires inserting
+|* or deleting of pages in some cases)
|*
\************************************************************************/
@@ -668,9 +663,8 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner )
mpOutliner->SetDepth( pPara, -1 );
- // werden da etwa mehrere Level-1-Absaetze auf Level 0 gebracht und
- // wir sollten eine Fortschrittsanzeige oder Eieruhr aufsetzen und
- // haben es noch nicht getan?
+ // are multiple level 1 paragraphs being brought to level 0 and we
+ // should start a progress view or a timer and didn't already?
if (mnPagesToProcess == 0)
{
Window* pActWin = mpOutlineViewShell->GetActiveWindow();
@@ -685,8 +679,8 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner )
pParagraph = (Paragraph*)pList->Next();
}
- mnPagesToProcess++; // der Absatz, der jetzt schon auf Level 0
- // steht, gehoert auch dazu
+ mnPagesToProcess++; // the paragraph being in level 0 already
+ // should be included
mnPagesProcessed = 0;
if (mnPagesToProcess > PROCESS_WITH_PROGRESS_THRESHOLD)
@@ -708,14 +702,14 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner )
mnPagesProcessed++;
- // muss eine Fortschrittsanzeige gepflegt werden?
+ // should there be a progress display?
if (mnPagesToProcess > PROCESS_WITH_PROGRESS_THRESHOLD)
{
if (mpProgress)
mpProgress->SetState(mnPagesProcessed);
}
- // war das die letzte Seite?
+ // was this the last page?
if (mnPagesProcessed == mnPagesToProcess)
{
if (mnPagesToProcess > PROCESS_WITH_PROGRESS_THRESHOLD && mpProgress)
@@ -744,7 +738,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner )
if (pParagraph)
nPos++;
}
- // Seite und Notizseite loeschen
+ // delete page and notes page
USHORT nAbsPos = (USHORT)nPos * 2 + 1;
SdrPage* pPage = mpDoc->GetPage(nAbsPos);
@@ -762,7 +756,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner )
mpOutliner->SetDepth( pPara, (pPage && (static_cast<SdPage*>(pPage)->GetAutoLayout() == AUTOLAYOUT_TITLE)) ? -1 : 0 );
- // ggfs. Fortschrittsanzeige
+ // progress display if necessary
if (mnPagesToProcess)
{
mnPagesProcessed++;
@@ -784,7 +778,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner )
}
else if ( (pOutliner->GetPrevDepth() == 1) && ( pOutliner->GetDepth( (USHORT) pOutliner->GetAbsPos( pPara ) ) == 2 ) )
{
- // wieviele Titel sind vor dem fraglichen Titelabsatz?
+ // how many titles are in front of the title paragraph in question?
sal_Int32 nPos = -1L;
Paragraph* pParagraph = pPara;
@@ -804,7 +798,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner )
}
}
- // wieviele Titel sind vor dem fraglichen Titelabsatz?
+ // how many titles are in front of the title paragraph in question?
sal_Int32 nPos = -1L;
Paragraph* pTempPara = pPara;
@@ -872,7 +866,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner )
/*************************************************************************
|*
-|* Handler fuer StatusEvents
+|* Handler for StatusEvents
|*
\************************************************************************/
@@ -888,7 +882,7 @@ IMPL_LINK( OutlineView, StatusEventHdl, EditStatus *, EMPTYARG )
Rectangle aWin(Point(0,0), pWin->GetOutputSizePixel());
aWin = pWin->PixelToLogic(aWin);
- if (!aVis.IsEmpty()) // nicht beim Oeffnen
+ if (!aVis.IsEmpty()) // not when opening
{
aText.Bottom() += aWin.GetHeight();
@@ -918,7 +912,7 @@ IMPL_LINK( OutlineView, EndDropHdl, void *, EMPTYARG )
/*************************************************************************
|*
-|* Handler fuer den Beginn einer Absatzverschiebung
+|* Handler for the start of a paragraph movement
|*
\************************************************************************/
@@ -931,7 +925,7 @@ IMPL_LINK( OutlineView, BeginMovingHdl, ::Outliner *, pOutliner )
mpOldParaOrder = new List;
- // Liste der selektierten Titelabsaetze
+ // list of selected title paragraphs
mpSelectedParas = mpOutlinerView[0]->CreateSelectionList();
Paragraph* pPara = static_cast<Paragraph*>(mpSelectedParas->First());
while (pPara)
@@ -947,20 +941,19 @@ IMPL_LINK( OutlineView, BeginMovingHdl, ::Outliner *, pOutliner )
}
}
- // Die zu den selektierten Absaetzen auf Ebene 0 gehoerenden Seiten
- // selektieren
+ // select the pages belonging to the paragraphs on level 0 to select
USHORT nPos = 0;
ULONG nParaPos = 0;
pPara = pOutliner->GetParagraph( 0 );
while(pPara)
{
- if( pOutliner->HasParaFlag(pPara, PARAFLAG_ISPAGE) ) // eine Seite?
+ if( pOutliner->HasParaFlag(pPara, PARAFLAG_ISPAGE) ) // one page?
{
mpOldParaOrder->Insert(pPara, LIST_APPEND);
SdPage* pPage = mpDoc->GetSdPage(nPos, PK_STANDARD);
pPage->SetSelected(FALSE);
- if (mpSelectedParas->Seek(pPara)) // selektiert?
+ if (mpSelectedParas->Seek(pPara)) // selected?
{
pPage->SetSelected(TRUE);
}
@@ -974,7 +967,7 @@ IMPL_LINK( OutlineView, BeginMovingHdl, ::Outliner *, pOutliner )
/*************************************************************************
|*
-|* Handler fuer das Ende einer Absatzverschiebung
+|* Handler for the end of a paragraph movement
|*
\************************************************************************/
@@ -986,10 +979,10 @@ IMPL_LINK( OutlineView, EndMovingHdl, ::Outliner *, pOutliner )
DBG_ASSERT(mpOldParaOrder, "keine Absatzliste");
DBG_ASSERT( isRecordingUndo(), "sd::OutlineView::EndMovingHdl(), model change without undo?!" );
- // Einfuegeposition anhand des ersten Absatzes suchen
+ // look for insertion position via the first paragraph
Paragraph* pSearchIt = (Paragraph*)mpSelectedParas->First();
- // den ersten der selektierten Paragraphen in der neuen Ordnung suchen
+ // look for the first of the selected paragraphs in the new ordering
USHORT nPosNewOrder = 0;
ULONG nParaPos = 0;
Paragraph* pPara = pOutliner->GetParagraph( 0 );
@@ -1004,21 +997,21 @@ IMPL_LINK( OutlineView, EndMovingHdl, ::Outliner *, pOutliner )
pPara = pOutliner->GetParagraph( ++nParaPos );
}
- USHORT nPos = nPosNewOrder; // nPosNewOrder nicht veraendern
+ USHORT nPos = nPosNewOrder; // don't change nPosNewOrder
if (nPos == 0)
{
- nPos = (USHORT)-1; // vor der ersten Seite einfuegen
+ nPos = (USHORT)-1; // insert before the first page
}
else
{
- // den Vorgaenger in der alten Ordnung suchen
+ // look for the predecessor in the old ordering
nPos = (USHORT)mpOldParaOrder->GetPos(pPrev);
DBG_ASSERT(nPos != 0xffff, "Absatz nicht gefunden");
}
mpDoc->MovePages(nPos);
- // die Seiten wieder deselektieren
+ // deselect the pages again
USHORT nPageCount = (USHORT)mpSelectedParas->Count();
while (nPageCount)
{
@@ -1042,7 +1035,7 @@ IMPL_LINK( OutlineView, EndMovingHdl, ::Outliner *, pOutliner )
/*************************************************************************
|*
-|* Eine Seite des Models nach dem Titeltextobjekt durchsuchen
+|* Look for the title text object in one page of the model
|*
\************************************************************************/
@@ -1068,7 +1061,7 @@ SdrTextObj* OutlineView::GetTitleTextObject(SdrPage* pPage)
/*************************************************************************
|*
-|* Eine Seite des Models nach dem Gliederungstextobjekt durchsuchen
+|* Look for the outline text object in one page of the model
|*
\************************************************************************/
@@ -1166,7 +1159,7 @@ BOOL OutlineView::PrepareClose(BOOL)
/*************************************************************************
|*
-|* Attribute des selektierten Textes setzen
+|* Set attributes of the selected text
|*
\************************************************************************/
@@ -1189,7 +1182,7 @@ BOOL OutlineView::SetAttributes(const SfxItemSet& rSet, BOOL )
/*************************************************************************
|*
-|* Attribute des selektierten Textes erfragen
+|* Get attributes of the selected text
|*
\************************************************************************/
@@ -1240,7 +1233,7 @@ void OutlineView::FillOutliner()
pPara = mpOutliner->Insert(String());
mpOutliner->SetDepth(pPara, -1);
- // Keine harten Attribute vom vorherigen Absatz uebernehmen
+ // do not apply hard attributes from the previous paragraph
mpOutliner->SetParaAttribs( (USHORT)mpOutliner->GetAbsPos(pPara),
mpOutliner->GetEmptyItemSet() );
@@ -1309,7 +1302,7 @@ void OutlineView::FillOutliner()
/*************************************************************************
|*
-|* Handler fuer das Loeschen von Level-0-Absaetzen (Seiten): Warnung
+|* Handler for deleting of level 0 paragraphs (pages): Warning
|*
\************************************************************************/
@@ -1340,7 +1333,7 @@ IMPL_LINK( OutlineView, RemovingPagesHdl, OutlinerView *, EMPTYARG )
/*************************************************************************
|*
-|* Handler fuer das Einruecken von Level-0-Absaetzen (Seiten): Warnung
+|* Handler for indenting level 0 paragraphs (pages): Warning
|*
\************************************************************************/
@@ -1431,7 +1424,7 @@ void OutlineView::SetActualPage( SdPage* pActual )
/*************************************************************************
|*
-|* StyleSheet aus der Selektion besorgen
+|* Get StyleSheet from the selection
|*
\************************************************************************/
@@ -1447,13 +1440,13 @@ SfxStyleSheet* OutlineView::GetStyleSheet() const
/*************************************************************************
|*
-|* Seiten als selektiert / nicht selektiert setzen
+|* Mark pages as selected / not selected
|*
\************************************************************************/
void OutlineView::SetSelectedPages()
{
- // Liste der selektierten Titelabsaetze
+ // list of selected title paragraphs
List* pSelParas = mpOutlinerView[0]->CreateSelectionList();
Paragraph* pPara = (Paragraph*) pSelParas->First();
@@ -1470,15 +1463,14 @@ void OutlineView::SetSelectedPages()
}
}
- // Die zu den selektierten Absaetzen auf Ebene 0 gehoerenden Seiten
- // selektieren
+ // select the pages belonging to the paragraphs on level 0 to select
USHORT nPos = 0;
ULONG nParaPos = 0;
pPara = mpOutliner->GetParagraph( 0 );
while(pPara)
{
- if( mpOutliner->HasParaFlag(pPara, PARAFLAG_ISPAGE) ) // eine Seite?
+ if( mpOutliner->HasParaFlag(pPara, PARAFLAG_ISPAGE) ) // one page
{
SdPage* pPage = mpDoc->GetSdPage(nPos, PK_STANDARD);
DBG_ASSERT(pPage!=NULL,
@@ -1487,7 +1479,7 @@ void OutlineView::SetSelectedPages()
{
pPage->SetSelected(FALSE);
- if (pSelParas->Seek(pPara)) // selektiert?
+ if (pSelParas->Seek(pPara)) // selected?
pPage->SetSelected(TRUE);
}
@@ -1501,13 +1493,13 @@ void OutlineView::SetSelectedPages()
/*************************************************************************
|*
-|* Neue Links setzen
+|* Set new links
|*
\************************************************************************/
void OutlineView::SetLinks()
{
- // Benachrichtigungs-Links setzen
+ // set notification links
mpOutliner->SetParaInsertedHdl(LINK(this, OutlineView, ParagraphInsertedHdl));
mpOutliner->SetParaRemovingHdl(LINK(this, OutlineView, ParagraphRemovingHdl));
mpOutliner->SetDepthChangedHdl(LINK(this, OutlineView, DepthChangedHdl));
@@ -1527,13 +1519,12 @@ void OutlineView::SetLinks()
/*************************************************************************
|*
-|* Alte Links restaurieren
+|* Restore old links
|*
\************************************************************************/
void OutlineView::ResetLinks() const
{
- // alte Links restaurieren
Link aEmptyLink;
mpOutliner->SetParaInsertedHdl(aEmptyLink);
mpOutliner->SetParaRemovingHdl(aEmptyLink);
diff --git a/sd/source/ui/view/zoomlist.cxx b/sd/source/ui/view/zoomlist.cxx
index 7ca7b48..34cbb44 100644
--- a/sd/source/ui/view/zoomlist.cxx
+++ b/sd/source/ui/view/zoomlist.cxx
@@ -45,7 +45,7 @@ namespace sd {
/*************************************************************************
|*
-|* Konstruktor
+|* Constructor
|*
\************************************************************************/
@@ -59,7 +59,7 @@ ZoomList::ZoomList(ViewShell* pViewShell)
/*************************************************************************
|*
-|* Destruktor
+|* Destructor
|*
\************************************************************************/
@@ -71,7 +71,7 @@ ZoomList::~ZoomList()
for (ULONG nObject=0; nObject<Count(); nObject++)
#endif
{
- // Ggf. ZoomRects loeschen
+ // delete ZoomRects if necessary
delete ((Rectangle*) GetObject(nObject));
}
}
@@ -79,7 +79,7 @@ ZoomList::~ZoomList()
/*************************************************************************
|*
-|* Neues ZoomRect aufnehmen
+|* Insert new ZoomRect
|*
\************************************************************************/
@@ -111,7 +111,7 @@ void ZoomList::InsertZoomRect(const Rectangle& rRect)
/*************************************************************************
|*
-|* Naechstes ZoomRect herausgeben
+|* Return next ZoomRect
|*
\************************************************************************/
@@ -135,7 +135,7 @@ Rectangle ZoomList::GetNextZoomRect()
/*************************************************************************
|*
-|* Letztes ZoomRect herausgeben
+|* Return last ZoomRect
|*
\************************************************************************/
@@ -156,7 +156,7 @@ Rectangle ZoomList::GetPreviousZoomRect()
/*************************************************************************
|*
-|* Gibt es ein naechstes ZoomRect?
+|* Is there a next ZoomRect?
|*
\************************************************************************/
@@ -175,7 +175,7 @@ BOOL ZoomList::IsNextPossible() const
/*************************************************************************
|*
-|* Gibt es ein vorheriges ZoomRect?
+|* Is there a previous ZoomRect?
|*
\************************************************************************/
commit 1602075988ec758341a184d54c67ed848d65d8a8
Author: Rafael Dominguez <venccsralph at gmail.com>
Date: Sat Mar 5 06:34:05 2011 -0800
Remove usage of List container.
diff --git a/sd/source/ui/dlg/assclass.cxx b/sd/source/ui/dlg/assclass.cxx
index c7c545f..a299d39 100644
--- a/sd/source/ui/dlg/assclass.cxx
+++ b/sd/source/ui/dlg/assclass.cxx
@@ -29,50 +29,37 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sd.hxx"
-
-#include <tools/list.hxx>
#include <tools/debug.hxx>
#include <vcl/ctrl.hxx>
#include "assclass.hxx"
-
Assistent::Assistent(int nNoOfPages)
+ : mnPages(nNoOfPages), mnCurrentPage(1)
{
- mnPages=nNoOfPages;
- if(mnPages>MAX_PAGES)
- {
- mnPages=MAX_PAGES;
- }
+ if(mnPages > MAX_PAGES)
+ mnPages = MAX_PAGES;
- mpPageStatus = new bool[mnPages];
+ mpPageStatus.reset(new bool[mnPages]);
- for(UINT8 i=0;i<mnPages;i++)
- {
- mpPages[i]=new List();
- mpPageStatus[i] = TRUE;
- }
- mnCurrentPage=1;
+ for(int i=0; i < mnPages; ++i)
+ mpPageStatus[i] = true;
}
-
-
bool Assistent::InsertControl(int nDestPage,Control* pUsedControl)
{
DBG_ASSERT( (nDestPage > 0) && (nDestPage <= mnPages), "Seite nicht vorhanden!");
+
if((nDestPage>0)&&(nDestPage<=mnPages))
{
- mpPages[nDestPage-1]->Insert(pUsedControl,LIST_APPEND);
+ maPages[nDestPage-1].push_back(pUsedControl);
pUsedControl->Hide();
pUsedControl->Disable();
return true;
}
- else
- {
- return false;
- }
-}
+ return false;
+}
bool Assistent::NextPage()
{
@@ -85,6 +72,7 @@ bool Assistent::NextPage()
if(nPage <= mnPages)
return GotoPage(nPage);
}
+
return false;
}
@@ -110,88 +98,67 @@ bool Assistent::GotoPage(const int nPageToGo)
if((nPageToGo>0)&&(nPageToGo<=mnPages)&&mpPageStatus[nPageToGo-1])
{
- int i;
- Control* pCurControl;
int nIndex=mnCurrentPage-1;
- for(i=0;i<(int)mpPages[nIndex]->Count();i++)
+ std::vector<Control*>::iterator iter = maPages[nIndex].begin();
+ std::vector<Control*>::iterator iterEnd = maPages[nIndex].end();
+
+ for(; iter != iterEnd; ++iter)
{
- pCurControl=(Control*)mpPages[nIndex]->GetObject(i);
- pCurControl->Disable();
- pCurControl->Hide();
- //schaltet die Controls der vorherigen Seite
- //zurueck
+ (*iter)->Disable();
+ (*iter)->Hide();
}
+
mnCurrentPage=nPageToGo;
nIndex=mnCurrentPage-1;
- for(i=0;i<(int)mpPages[nIndex]->Count();i++)
- {
- pCurControl=(Control*)mpPages[nIndex]->GetObject(i);
- pCurControl->Enable();
- pCurControl->Show();
- //zeigt die neue Seite im Fenster an
+ iter = maPages[nIndex].begin();
+ iterEnd = maPages[nIndex].end();
+
+ for(; iter != iterEnd; ++iter)
+ {
+ (*iter)->Enable();
+ (*iter)->Show();
}
+
return true;
}
- else
- {
- return false;
- }
+
+ return false;
}
-bool Assistent::IsLastPage()
+bool Assistent::IsLastPage() const
{
- if(mnCurrentPage==mnPages)
- {
+ if(mnCurrentPage == mnPages)
return true;
- }
- else
- {
- int nPage = mnCurrentPage+1;
- while(nPage <= mnPages && !mpPageStatus[nPage-1])
- nPage++;
- return nPage > mnPages;
- }
+ int nPage = mnCurrentPage+1;
+ while(nPage <= mnPages && !mpPageStatus[nPage-1])
+ nPage++;
+
+ return nPage > mnPages;
}
-bool Assistent::IsFirstPage()
+bool Assistent::IsFirstPage() const
{
- if(mnCurrentPage==1)
- {
+ if(mnCurrentPage == 1)
return true;
- }
- else
- {
- int nPage = mnCurrentPage-1;
- while(nPage > 0 && !mpPageStatus[nPage-1])
- nPage--;
-
- return nPage == 0;
- }
-}
-
+ int nPage = mnCurrentPage-1;
+ while(nPage > 0 && !mpPageStatus[nPage-1])
+ nPage--;
-int Assistent::GetCurrentPage()
-{
- return mnCurrentPage;
+ return nPage == 0;
}
-Assistent::~Assistent()
+int Assistent::GetCurrentPage() const
{
- for( int i=0;i<mnPages;i++)
- {
- delete mpPages[i];
- }
-
- delete [] mpPageStatus;
+ return mnCurrentPage;
}
-bool Assistent::IsEnabled( int nPage )
+bool Assistent::IsEnabled( int nPage ) const
{
DBG_ASSERT( (nPage>0) && (nPage <= mnPages), "Seite nicht vorhanden!" );
diff --git a/sd/source/ui/inc/assclass.hxx b/sd/source/ui/inc/assclass.hxx
index 11a7651..435801f 100644
--- a/sd/source/ui/inc/assclass.hxx
+++ b/sd/source/ui/inc/assclass.hxx
@@ -29,17 +29,19 @@
#ifndef INC_ASSCLASS
#define INC_ASSCLASS
+#include <vector>
+#include <boost/scoped_array.hpp>
+
#include <tools/solar.h>
#include "sddllapi.h"
#define MAX_PAGES 10
-class List;
class Control;
class SD_DLLPUBLIC Assistent
{
- List* mpPages[MAX_PAGES];
+ std::vector<Control*> maPages[MAX_PAGES];
//enthaelt fuer jede Seite die Controls die
//korrekt geschaltet werden muessen
@@ -49,13 +51,13 @@ class SD_DLLPUBLIC Assistent
int mnCurrentPage;
//gibt die aktuelle Seite an
- bool* mpPageStatus;
+ boost::scoped_array<bool> mpPageStatus;
public:
Assistent(int nNoOfPage);
- bool IsEnabled( int nPage );
+ bool IsEnabled ( int nPage ) const;
void EnablePage( int nPage );
void DisablePage( int nPage );
@@ -71,16 +73,14 @@ public:
bool GotoPage(const int nPageToGo);
//springt zu einer angegebenen Seite
- bool IsLastPage();
+ bool IsLastPage() const;
//gibt an ob die aktuelle Seite die letzte ist
- bool IsFirstPage();
+ bool IsFirstPage() const;
//gibt an ob die aktuelle Seite die erste ist
- int GetCurrentPage();
+ int GetCurrentPage() const;
//gibt die aktuelle Seite zurueck
-
- ~Assistent();
};
commit f9c0b40160b5081c16613d7ea592e42db0be437c
Author: Rafael Dominguez <venccsralph at gmail.com>
Date: Fri Mar 4 21:49:59 2011 -0800
Remove usage of List container.
diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx
index b1eb448..bbf4ff8 100644
--- a/sd/inc/stlpool.hxx
+++ b/sd/inc/stlpool.hxx
@@ -50,6 +50,7 @@
class SdStyleSheet;
class SdDrawDocument;
class SdPage;
+class SfxStyleSheetBase;
typedef std::map< const SdPage*, SdStyleFamilyRef > SdStyleFamilyMap;
@@ -71,7 +72,7 @@ public:
SfxStyleSheetBase* GetTitleSheet(const String& rLayoutName);
// Caller muss Liste loeschen
- List* CreateOutlineSheetList(const String& rLayoutName);
+ void CreateOutlineSheetList(const String& rLayoutName, std::vector<SfxStyleSheetBase*> &rOutlineStyles);
/** creates all layout style sheets for the givin layout name if they
don't exist yet.
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index af94e5d..5162659 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -752,9 +752,10 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
String aName = pPage->GetLayoutName();
aName.Erase( aName.SearchAscii( SD_LT_SEPARATOR ));
- List* pOutlineList = pSPool->CreateOutlineSheetList(aName);
- SfxStyleSheet* pTitleSheet = (SfxStyleSheet*)
- pSPool->GetTitleSheet(aName);
+ std::vector<SfxStyleSheetBase*> aOutlineList;
+ pSPool->CreateOutlineSheetList(aName,aOutlineList);
+
+ SfxStyleSheet* pTitleSheet = (SfxStyleSheet*)pSPool->GetTitleSheet(aName);
SdrObject* pObj = rPresentationShapes.getNextShape(0);
@@ -781,14 +782,16 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
if( pOPO && pOPO->GetOutlinerMode() == OUTLINERMODE_DONTKNOW )
pOPO->SetOutlinerMode( OUTLINERMODE_OUTLINEOBJECT );
- for (USHORT nSheet = 0; nSheet < 10; nSheet++)
+ std::vector<SfxStyleSheetBase*>::iterator iter;
+ for (iter = aOutlineList.begin(); iter != aOutlineList.end(); ++iter)
{
- SfxStyleSheet* pSheet = (SfxStyleSheet*)pOutlineList->GetObject(nSheet);
+ SfxStyleSheet* pSheet = reinterpret_cast<SfxStyleSheet*>(*iter);
+
if (pSheet)
{
pObj->StartListening(*pSheet);
- if( nSheet == 0)
+ if( iter == aOutlineList.begin())
// Textrahmen hoert auf StyleSheet der Ebene1
pObj->NbcSetStyleSheet(pSheet, TRUE);
}
@@ -812,8 +815,6 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
pObj = rPresentationShapes.getNextShape(pObj);
}
-
- delete pOutlineList;
}
}
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index 5bdc96c..4ce39c3 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -42,7 +42,6 @@
#include <svl/urihelper.hxx>
#include <editeng/xmlcnitm.hxx>
#include <svx/svditer.hxx>
-#include <tools/list.hxx>
#include "sdresid.hxx"
#include "sdpage.hxx"
@@ -283,15 +282,17 @@ void SdPage::EndListenOutlineText()
DBG_ASSERT(pSPool, "StyleSheetPool nicht gefunden");
String aTrueLayoutName(maLayoutName);
aTrueLayoutName.Erase( aTrueLayoutName.SearchAscii( SD_LT_SEPARATOR ));
- List* pOutlineStyles = pSPool->CreateOutlineSheetList(aTrueLayoutName);
- for (SfxStyleSheet* pSheet = (SfxStyleSheet*)pOutlineStyles->First();
- pSheet;
- pSheet = (SfxStyleSheet*)pOutlineStyles->Next())
- {
- pOutlineTextObj->EndListening(*pSheet);
- }
- delete pOutlineStyles;
+ SfxStyleSheet *pSheet = NULL;
+ std::vector<SfxStyleSheetBase*> aOutlineStyles;
+ pSPool->CreateOutlineSheetList(aTrueLayoutName,aOutlineStyles);
+
+ std::vector<SfxStyleSheetBase*>::iterator iter;
+ for (iter = aOutlineStyles.begin(); iter != aOutlineStyles.end(); ++iter)
+ {
+ pSheet = reinterpret_cast<SfxStyleSheet*>(*iter);
+ pOutlineTextObj->EndListening(*pSheet);
+ }
}
}
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 77654bc..9ff94f2 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -149,21 +149,22 @@ SfxStyleSheetBase* SdStyleSheetPool::GetTitleSheet(const String& rLayoutName)
|*
\************************************************************************/
-List* SdStyleSheetPool::CreateOutlineSheetList (const String& rLayoutName)
+void SdStyleSheetPool::CreateOutlineSheetList (const String& rLayoutName, std::vector<SfxStyleSheetBase*> &rOutlineStyles)
{
String aName(rLayoutName);
aName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ));
aName += String(SdResId(STR_LAYOUT_OUTLINE));
- List* pList = new List;
+
for (USHORT nSheet = 1; nSheet < 10; nSheet++)
{
String aFullName(aName);
aFullName.Append( sal_Unicode( ' ' ));
aFullName.Append( String::CreateFromInt32( (sal_Int32)nSheet ));
SfxStyleSheetBase* pSheet = Find(aFullName, SD_STYLE_FAMILY_MASTERPAGE);
- pList->Insert(pSheet, LIST_APPEND);
+
+ if (pSheet)
+ rOutlineStyles.push_back(pSheet);
}
- return pList;
}
/*************************************************************************
@@ -677,18 +678,28 @@ void SdStyleSheetPool::CopyLayoutSheets(const String& rLayoutName, SdStyleSheetP
}
// Sonderbehandlung fuer Gliederungsvorlagen: Parentbeziehungen aufbauen
- List* pOutlineSheets = CreateOutlineSheetList(rLayoutName);
- SfxStyleSheetBase* pParent = (SfxStyleSheetBase*)pOutlineSheets->First();
- pSheet = (SfxStyleSheetBase*)pOutlineSheets->Next();
- while (pSheet)
+ std::vector<SfxStyleSheetBase*> aOutlineSheets;
+ CreateOutlineSheetList(rLayoutName,aOutlineSheets);
+
+ std::vector<SfxStyleSheetBase*>::iterator it = aOutlineSheets.begin();
+
+ SfxStyleSheetBase* pParent = *it;
+ ++it;
+
+ while (it != aOutlineSheets.end())
{
- // kein Parent?
+ pSheet = *it;
+
+ if (!pSheet)
+ break;
+
if (pSheet->GetParent().Len() == 0)
pSheet->SetParent(pParent->GetName());
+
pParent = pSheet;
- pSheet = (SfxStyleSheetBase*)pOutlineSheets->Next();
+
+ ++it;
}
- delete pOutlineSheets;
}
/*************************************************************************
commit fa68c93225ba357c677592f0a59a7100ed141dd7
Author: Rafael Dominguez <venccsralph at gmail.com>
Date: Fri Mar 4 21:18:25 2011 -0800
Remove usage of List container.
diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx
index 212892c..b1eb448 100644
--- a/sd/inc/stlpool.hxx
+++ b/sd/inc/stlpool.hxx
@@ -82,7 +82,7 @@ public:
when styles are missing.
*/
SD_DLLPUBLIC void CreateLayoutStyleSheets(const String& rLayoutName, sal_Bool bCheck = sal_False );
- List* CreateLayoutSheetNames(const String& rLayoutName) const;
+ void CreateLayoutSheetNames(const String& rLayoutName, std::vector<String> &aNameList) const;
void CreateLayoutSheetList(const String& rLayoutName, SdStyleSheetVector& rLayoutSheets);
void CopyLayoutSheets(const String& rLayoutName, SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets );
void CopyGraphicSheets(SdStyleSheetPool& rSourcePool);
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 4b9eb83..77654bc 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -96,12 +96,12 @@ SdStyleSheetPool::SdStyleSheetPool(SfxItemPool const& _rPool, SdDrawDocument* pD
// create graphics family
mxGraphicFamily = new SdStyleFamily( xPool, SD_STYLE_FAMILY_GRAPHICS );
mxCellFamily = new SdStyleFamily( xPool, SD_STYLE_FAMILY_CELL );
-
+
mxTableFamily = sdr::table::CreateTableDesignFamily();
Reference< XNamed > xNamed( mxTableFamily, UNO_QUERY );
if( xNamed.is() )
msTableFamilyName = xNamed->getName();
-
+
// create presentation families, one for each master page
const sal_uInt16 nCount = mpDoc->GetMasterSdPageCount(PK_STANDARD);
for( sal_uInt16 nPage = 0; nPage < nCount; ++nPage )
@@ -545,7 +545,7 @@ void SdStyleSheetPool::CopyTableStyles(SdStyleSheetPool& rSourcePool)
if( xSource.is() && xFactory.is() && mxTableFamily.is() )
{
for( sal_Int32 nIndex = 0; nIndex < xSource->getCount(); nIndex++ ) try
- {
+ {
Reference< XStyle > xSourceTableStyle( xSource->getByIndex( nIndex ), UNO_QUERY );
if( xSourceTableStyle.is() )
{
@@ -654,30 +654,27 @@ void SdStyleSheetPool::CopyLayoutSheets(const String& rLayoutName, SdStyleSheetP
String aOutlineTag(SdResId(STR_LAYOUT_OUTLINE));
- List* pNameList = CreateLayoutSheetNames(rLayoutName);
+ std::vector<String> aNameList;
+ CreateLayoutSheetNames(rLayoutName,aNameList);
String sEmpty;
- String* pName = (String*)pNameList->First();
- while (pName)
+ for (std::vector<String>::const_iterator it = aNameList.begin(); it != aNameList.end(); ++it)
{
- pSheet = Find(*pName, SD_STYLE_FAMILY_MASTERPAGE);
+ pSheet = Find(*it, SD_STYLE_FAMILY_MASTERPAGE);
if (!pSheet)
{
- SfxStyleSheetBase* pSourceSheet = rSourcePool.Find(*pName, SD_STYLE_FAMILY_MASTERPAGE);
+ SfxStyleSheetBase* pSourceSheet = rSourcePool.Find(*it, SD_STYLE_FAMILY_MASTERPAGE);
DBG_ASSERT(pSourceSheet, "CopyLayoutSheets: Quellvorlage nicht gefunden");
if (pSourceSheet)
{
// falls einer mit Methusalem-Doks. ankommt
- SfxStyleSheetBase& rNewSheet = Make(*pName, SD_STYLE_FAMILY_MASTERPAGE);
+ SfxStyleSheetBase& rNewSheet = Make(*it, SD_STYLE_FAMILY_MASTERPAGE);
rNewSheet.SetHelpId( sEmpty, pSourceSheet->GetHelpId( sEmpty ) );
rNewSheet.GetItemSet().Put(pSourceSheet->GetItemSet());
rCreatedSheets.push_back( SdStyleSheetRef( static_cast< SdStyleSheet* >( &rNewSheet ) ) );
}
}
- delete pName;
- pName = (String*)pNameList->Next();
}
- delete pNameList;
// Sonderbehandlung fuer Gliederungsvorlagen: Parentbeziehungen aufbauen
List* pOutlineSheets = CreateOutlineSheetList(rLayoutName);
@@ -701,47 +698,43 @@ void SdStyleSheetPool::CopyLayoutSheets(const String& rLayoutName, SdStyleSheetP
|*
\************************************************************************/
-List* SdStyleSheetPool::CreateLayoutSheetNames(const String& rLayoutName) const
+void SdStyleSheetPool::CreateLayoutSheetNames(const String& rLayoutName, std::vector<String> &aNameList) const
{
String aPrefix(rLayoutName);
String aSep( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ));
aPrefix.Insert(aSep);
- List* pNameList = new List;
-
String aName(SdResId(STR_LAYOUT_OUTLINE));
- String* pName = NULL;
+ String aStr;
for (USHORT nLevel = 1; nLevel < 10; nLevel++)
{
- pName = new String(aName);
- pName->Append( sal_Unicode( ' ' ));
- pName->Append( String::CreateFromInt32( sal_Int32( nLevel )));
- pName->Insert(aPrefix, 0);
- pNameList->Insert(pName, LIST_APPEND);
+ aStr = String( aPrefix );
+ aStr.Append(aName);
+ aStr.Append( sal_Unicode( ' ' ));
+ aStr.Append( String::CreateFromInt32( sal_Int32( nLevel )));
+ aNameList.push_back(aStr);
}
- pName = new String(SdResId(STR_LAYOUT_TITLE));
- pName->Insert(aPrefix, 0);
- pNameList->Insert(pName, LIST_APPEND);
-
- pName = new String(SdResId(STR_LAYOUT_SUBTITLE));
- pName->Insert(aPrefix, 0);
- pNameList->Insert(pName, LIST_APPEND);
+ aStr = String(SdResId(STR_LAYOUT_TITLE));
+ aStr.Insert(aPrefix, 0);
+ aNameList.push_back(aStr);
- pName = new String(SdResId(STR_LAYOUT_NOTES));
- pName->Insert(aPrefix, 0);
- pNameList->Insert(pName, LIST_APPEND);
+ aStr = String(SdResId(STR_LAYOUT_SUBTITLE));
+ aStr.Insert(aPrefix, 0);
+ aNameList.push_back(aStr);
- pName = new String(SdResId(STR_LAYOUT_BACKGROUNDOBJECTS));
- pName->Insert(aPrefix, 0);
- pNameList->Insert(pName, LIST_APPEND);
+ aStr = String(SdResId(STR_LAYOUT_NOTES));
+ aStr.Insert(aPrefix, 0);
+ aNameList.push_back(aStr);
- pName = new String(SdResId(STR_LAYOUT_BACKGROUND));
- pName->Insert(aPrefix, 0);
- pNameList->Insert(pName, LIST_APPEND);
+ aStr = String(SdResId(STR_LAYOUT_BACKGROUNDOBJECTS));
+ aStr.Insert(aPrefix, 0);
+ aNameList.push_back(aStr);
- return pNameList;
+ aStr = String(SdResId(STR_LAYOUT_BACKGROUND));
+ aStr.Insert(aPrefix, 0);
+ aNameList.push_back(aStr);
}
/*************************************************************************
@@ -1227,7 +1220,7 @@ Any SAL_CALL SdStyleSheetPool::getByName( const OUString& aName ) throw(NoSuchEl
Sequence< OUString > SAL_CALL SdStyleSheetPool::getElementNames() throw(RuntimeException)
{
throwIfDisposed();
-
+
Sequence< OUString > aNames( maStyleFamilyMap.size() + 3 );
OUString* pNames = aNames.getArray();
commit bd2ed85984f9e419a1f5cfbbf1bbfc39d19afb3f
Author: Rafael Dominguez <venccsralph at gmail.com>
Date: Fri Mar 4 07:38:16 2011 -0800
Remove usage of deprecated List container.
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index 31b176e..5bdc96c 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -28,6 +28,10 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sd.hxx"
+
+#include <vector>
+#include <boost/ptr_container/ptr_vector.hpp>
+
#include <sfx2/docfile.hxx>
#include <vcl/svapp.hxx>
#include <editeng/outliner.hxx>
@@ -146,10 +150,10 @@ void SdPage::SetPresentationLayout(const String& rLayoutName,
// Listen mit:
// - Vorlagenzeigern fuer Gliederungstextobjekt (alte und neue Vorlagen)
// -Replacedaten fuer OutlinerParaObject
- List aOutlineStyles;
- List aOldOutlineStyles;
- List aReplList;
- BOOL bListsFilled = FALSE;
+ std::vector<SfxStyleSheetBase*> aOutlineStyles;
+ std::vector<SfxStyleSheetBase*> aOldOutlineStyles;
+ boost::ptr_vector<StyleReplaceData> aReplList;
+ bool bListsFilled = false;
ULONG nObjCount = GetObjCount();
@@ -178,11 +182,11 @@ void SdPage::SetPresentationLayout(const String& rLayoutName,
pSheet = pStShPool->Find(aOldFullName, SD_STYLE_FAMILY_MASTERPAGE);
DBG_ASSERT(pSheet, "alte Gliederungsvorlage nicht gefunden");
- aOldOutlineStyles.Insert(pSheet, LIST_APPEND);
+ aOldOutlineStyles.push_back(pSheet);
pSheet = pStShPool->Find(aFullName, SD_STYLE_FAMILY_MASTERPAGE);
DBG_ASSERT(pSheet, "neue Gliederungsvorlage nicht gefunden");
- aOutlineStyles.Insert(pSheet, LIST_APPEND);
+ aOutlineStyles.push_back(pSheet);
if (bReplaceStyleSheets && pSheet)
{
@@ -192,7 +196,7 @@ void SdPage::SetPresentationLayout(const String& rLayoutName,
pReplData->nFamily = pSheet->GetFamily();
pReplData->aNewName = aFullName;
pReplData->aName = aOldFullName;
- aReplList.Insert(pReplData, LIST_APPEND);
+ aReplList.push_back(pReplData);
}
else
{
@@ -203,13 +207,20 @@ void SdPage::SetPresentationLayout(const String& rLayoutName,
}
}
- bListsFilled = TRUE;
+ bListsFilled = true;
}
- SfxStyleSheet* pSheet = (SfxStyleSheet*)aOutlineStyles.First();
- SfxStyleSheet* pOldSheet = (SfxStyleSheet*)aOldOutlineStyles.First();
- while (pSheet)
+ SfxStyleSheet* pSheet = NULL;
+ SfxStyleSheet* pOldSheet = NULL;
+
+ std::vector<SfxStyleSheetBase*>::iterator iterOut = aOutlineStyles.begin();
+ std::vector<SfxStyleSheetBase*>::iterator iterOldOut = aOldOutlineStyles.begin();
+
+ while (iterOut != aOutlineStyles.end())
{
+ pSheet = reinterpret_cast<SfxStyleSheet*>(*iterOut);
+ pOldSheet = reinterpret_cast<SfxStyleSheet*>(*iterOldOut);
+
if (pSheet != pOldSheet)
{
pObj->EndListening(*pOldSheet);
@@ -218,19 +229,18 @@ void SdPage::SetPresentationLayout(const String& rLayoutName,
pObj->StartListening(*pSheet);
}
- pSheet = (SfxStyleSheet*)aOutlineStyles.Next();
- pOldSheet = (SfxStyleSheet*)aOldOutlineStyles.Next();
+ ++iterOut;
+ ++iterOldOut;
}
OutlinerParaObject* pOPO = ((SdrTextObj*)pObj)->GetOutlinerParaObject();
if ( bReplaceStyleSheets && pOPO )
{
- StyleReplaceData* pReplData = (StyleReplaceData*) aReplList.First();
-
- while( pReplData )
+ boost::ptr_vector<StyleReplaceData>::const_iterator it = aReplList.begin();
+ while (it != aReplList.end())
{
- pOPO->ChangeStyleSheets( pReplData->aName, pReplData->nFamily, pReplData->aNewName, pReplData->nNewFamily );
- pReplData = (StyleReplaceData*) aReplList.Next();
+ pOPO->ChangeStyleSheets( it->aName, it->nFamily, it->aNewName, it->nNewFamily );
+ ++it;
}
}
}
@@ -253,11 +263,6 @@ void SdPage::SetPresentationLayout(const String& rLayoutName,
pObj->SetStyleSheet(pSheet, TRUE);
}
}
-
- for (ULONG i = 0; i < aReplList.Count(); i++)
- {
- delete (StyleReplaceData*) aReplList.GetObject(i);
- }
}
commit b8ff6605fe16892cd5b8bf366b991d258a124793
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Mar 3 20:56:44 2011 +0100
findbar: Add the findbar to the menus above the Search dialog.
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index 35021c7..55f620d 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -55,6 +55,7 @@
<menu:menuitem menu:id=".uno:PasteSpecial"/>
<menu:menuitem menu:id=".uno:SelectAll"/>
<menu:menuseparator/>
+ <menu:menuitem menu:id="vnd.sun.star.findbar:FocusToFindbar"/>
<menu:menuitem menu:id=".uno:SearchDialog"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:CopyObjects"/>
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index 4ae1665..03ddd6d 100755
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -57,6 +57,7 @@
<menu:menuitem menu:id=".uno:PasteSpecial"/>
<menu:menuitem menu:id=".uno:SelectAll"/>
<menu:menuseparator/>
+ <menu:menuitem menu:id="vnd.sun.star.findbar:FocusToFindbar"/>
<menu:menuitem menu:id=".uno:SearchDialog"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:CopyObjects"/>
commit d2a73910caea5c2013447681a6c0fd132a40d9f8
Author: Rafael Dominguez <venccsralph at gmail.com>
Date: Wed Mar 2 19:48:50 2011 -0800
Remove dead code inside sd.
diff --git a/sd/source/ui/inc/bmcache.hxx b/sd/source/ui/inc/bmcache.hxx
deleted file mode 100644
index 3841dc3..0000000
--- a/sd/source/ui/inc/bmcache.hxx
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SD_BMCACHE_HXX
-#define _SD_BMCACHE_HXX
-
-#include <tools/list.hxx>
-
-
-class SdPage;
-class GraphicObject;
-
-class BitmapCache
-{
- ULONG nMaxSize;
- ULONG nCurSize;
- List aEntries;
-
-public:
- BitmapCache(ULONG nMaxSizeKB)
- : nMaxSize(nMaxSizeKB), nCurSize(0) {}
- virtual ~BitmapCache();
-
- void Remove(const SdPage* pPage);
-};
-
-#endif // _SD_BMCACHE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/fuslsel.hxx b/sd/source/ui/inc/fuslsel.hxx
deleted file mode 100644
index 23b4549..0000000
--- a/sd/source/ui/inc/fuslsel.hxx
+++ /dev/null
@@ -1,122 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SD_FU_SLIDE_SELECTION_HXX
-#define SD_FU_SLIDE_SELECTION_HXX
-
-#include "fuslid.hxx"
-#include <tools/list.hxx>
-
-class SdDrawDocument;
-class Sound;
-
-namespace sd {
-
-class SlideView;
-class SlideViewShell;
-class Window;
-
-struct FSS_IsShowingEffectInfo
-{
- BOOL bIsShowingEffect; // TRUE while we show a fade effect one the slide view
- BOOL bDisposed; // TRUE if the FuSlideSelection was deleted during fade effect
-};
-
-
-class FuSlideSelection
- : public FuSlide
-{
-public:
- TYPEINFO();
-
- static FunctionReference Create( SlideViewShell* pViewSh, ::sd::Window* pWin, SlideView* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
- virtual void DoExecute( SfxRequest& rReq );
-
- // Mouse- & Key-Events
- virtual BOOL KeyInput(const KeyEvent& rKEvt);
- virtual BOOL MouseMove(const MouseEvent& rMEvt);
- virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
- virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
- virtual void Paint(const Rectangle& rRect, ::sd::Window* pWin);
-
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
-
- virtual void ScrollStart();
- virtual void ScrollEnd();
-
- BOOL IsShowingEffect() const { return pIsShowingEffectInfo && pIsShowingEffectInfo->bIsShowingEffect; }
-
- /** is called when the currenct function should be aborted. <p>
- This is used when a function gets a KEY_ESCAPE but can also
- be called directly.
-
- @returns true if a active function was aborted
- */
- virtual bool cancel();
-
-protected:
- FuSlideSelection (
- SlideViewShell* pViewSh,
- ::sd::Window* pWin,
- SlideView* pView,
- SdDrawDocument* pDoc,
- SfxRequest& rReq);
- virtual ~FuSlideSelection (void);
-
-private:
- BOOL bSubstShown;
- BOOL bPageHit;
- List aSubstList; // Liste mit Ertsatzdarstellungen
- Point aDragPos; // hier wird die Seite angefasst
- BOOL bDragSelection;
- Point aDragSelRectAnchor; // fester Punkt des Selektionsrechtecks
- Rectangle aDragSelRect;
- Point aPosOfInsertMarker;
- FSS_IsShowingEffectInfo* pIsShowingEffectInfo;
-
- void DrawInsertMarker(BOOL bShow);
- Point CalcPosOfInsertMarker(const Point& rPoint);
-
- USHORT GetTargetPage(const Point& rPoint) const;
-
- void CreateSubst();
- void DeleteSubst();
- void DrawSubst() const;
- void ChangeSubstPos(const Point& rVector);
- void DrawDragSelectionRect() const;
- void ShowEffect(USHORT nPageNo);
-
- DECL_LINK( DragSlideHdl, Timer* );
-};
-
-} // end of namespace sd
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/view/bmcache.cxx b/sd/source/ui/view/bmcache.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list