Kaydet (Commit) cb5fa11b authored tarafından Urs Fässler's avatar Urs Fässler

comment translation and cleanup of files in sd/source/ui/dlg/

Change-Id: Ief58723557fa0840b3a10258ca347cf219593264
üst a401b53f
...@@ -34,12 +34,9 @@ ...@@ -34,12 +34,9 @@
#include <svx/flagsdef.hxx> #include <svx/flagsdef.hxx>
#include <editeng/svxenum.hxx> #include <editeng/svxenum.hxx>
/************************************************************************* /**
|* * Constructor of tab dialog: appends pages to the dialog
|* Konstruktor des Tab-Dialogs: Fuegt die Seiten zum Dialog hinzu */
|*
\************************************************************************/
SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, sal_Bool bAreaPage ) : SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, sal_Bool bAreaPage ) :
SfxTabDialog ( pParent, SdResId( TAB_PAGE ), pAttr ), SfxTabDialog ( pParent, SdResId( TAB_PAGE ), pAttr ),
mpDocShell ( pDocSh ) mpDocShell ( pDocSh )
...@@ -68,12 +65,6 @@ SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* ...@@ -68,12 +65,6 @@ SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet*
} }
/*************************************************************************
|*
|* Seite wird erzeugt
|*
\************************************************************************/
void SdPageDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage) void SdPageDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
{ {
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
......
...@@ -36,12 +36,9 @@ ...@@ -36,12 +36,9 @@
#include "dlgsnap.hxx" #include "dlgsnap.hxx"
/************************************************************************* /**
|* * dialog to adjust grid (scarcely ESO!)
|* Dialog zum Einstellen des Rasters (wohl kaum ESO!) */
|*
\************************************************************************/
SdSnapLineDlg::SdSnapLineDlg( SdSnapLineDlg::SdSnapLineDlg(
::Window* pWindow, ::Window* pWindow,
const SfxItemSet& rInAttrs, const SfxItemSet& rInAttrs,
...@@ -74,10 +71,10 @@ SdSnapLineDlg::SdSnapLineDlg( ...@@ -74,10 +71,10 @@ SdSnapLineDlg::SdSnapLineDlg(
SetFieldUnit( aMtrFldX, eUIUnit, sal_True ); SetFieldUnit( aMtrFldX, eUIUnit, sal_True );
SetFieldUnit( aMtrFldY, eUIUnit, sal_True ); SetFieldUnit( aMtrFldY, eUIUnit, sal_True );
// WorkArea holen // get WorkArea
Rectangle aWorkArea = pView->GetWorkArea(); Rectangle aWorkArea = pView->GetWorkArea();
// PoolUnit ermitteln // determine PoolUnit
SfxItemPool* pPool = rInAttrs.GetPool(); SfxItemPool* pPool = rInAttrs.GetPool();
DBG_ASSERT( pPool, "Wo ist der Pool?" ); DBG_ASSERT( pPool, "Wo ist der Pool?" );
SfxMapUnit ePoolUnit = pPool->GetMetric( SID_ATTR_FILL_HATCH ); SfxMapUnit ePoolUnit = pPool->GetMetric( SID_ATTR_FILL_HATCH );
...@@ -89,8 +86,8 @@ SdSnapLineDlg::SdSnapLineDlg( ...@@ -89,8 +86,8 @@ SdSnapLineDlg::SdSnapLineDlg(
Point aRightBottom(aWorkArea.Right()-2, aWorkArea.Bottom()-2); Point aRightBottom(aWorkArea.Right()-2, aWorkArea.Bottom()-2);
pPV->LogicToPagePos(aRightBottom); pPV->LogicToPagePos(aRightBottom);
// Hier werden die Max- und MinWerte in Abhaengigkeit von der // determine max and min values depending on
// WorkArea, PoolUnit und der FieldUnit: // WorkArea, PoolUnit and FieldUnit:
SetMetricValue( aMtrFldX, aLeftTop.X(), ePoolUnit ); SetMetricValue( aMtrFldX, aLeftTop.X(), ePoolUnit );
long nValue = static_cast<long>(aMtrFldX.GetValue()); long nValue = static_cast<long>(aMtrFldX.GetValue());
...@@ -116,7 +113,7 @@ SdSnapLineDlg::SdSnapLineDlg( ...@@ -116,7 +113,7 @@ SdSnapLineDlg::SdSnapLineDlg(
aMtrFldY.SetMax( nValue ); aMtrFldY.SetMax( nValue );
aMtrFldY.SetLast( nValue ); aMtrFldY.SetLast( nValue );
// Setzen der Werte // set values
nXValue = ((const SfxUInt32Item&) rInAttrs.Get(ATTR_SNAPLINE_X)).GetValue(); nXValue = ((const SfxUInt32Item&) rInAttrs.Get(ATTR_SNAPLINE_X)).GetValue();
nYValue = ((const SfxUInt32Item&) rInAttrs.Get(ATTR_SNAPLINE_Y)).GetValue(); nYValue = ((const SfxUInt32Item&) rInAttrs.Get(ATTR_SNAPLINE_Y)).GetValue();
nXValue = Fraction(nXValue) / aUIScale; nXValue = Fraction(nXValue) / aUIScale;
...@@ -127,12 +124,9 @@ SdSnapLineDlg::SdSnapLineDlg( ...@@ -127,12 +124,9 @@ SdSnapLineDlg::SdSnapLineDlg(
aRbPoint.Check(); aRbPoint.Check();
} }
/************************************************************************* /**
|* * fills provided item sets with dialog box attributes
|* Fuellt uebergebenes Item-Set mit Dialogbox-Attributen */
|*
\************************************************************************/
IMPL_LINK( SdSnapLineDlg, ClickHdl, Button *, pBtn ) IMPL_LINK( SdSnapLineDlg, ClickHdl, Button *, pBtn )
{ {
if ( pBtn == &aRbPoint ) SetInputFields(sal_True, sal_True); if ( pBtn == &aRbPoint ) SetInputFields(sal_True, sal_True);
...@@ -143,12 +137,9 @@ IMPL_LINK( SdSnapLineDlg, ClickHdl, Button *, pBtn ) ...@@ -143,12 +137,9 @@ IMPL_LINK( SdSnapLineDlg, ClickHdl, Button *, pBtn )
return 0; return 0;
} }
/************************************************************************* /**
|* * fills provided item sets with dialog box attributes
|* Fuellt uebergebenes Item-Set mit Dialogbox-Attributen */
|*
\************************************************************************/
void SdSnapLineDlg::GetAttr(SfxItemSet& rOutAttrs) void SdSnapLineDlg::GetAttr(SfxItemSet& rOutAttrs)
{ {
SnapKind eKind; SnapKind eKind;
...@@ -165,12 +156,6 @@ void SdSnapLineDlg::GetAttr(SfxItemSet& rOutAttrs) ...@@ -165,12 +156,6 @@ void SdSnapLineDlg::GetAttr(SfxItemSet& rOutAttrs)
rOutAttrs.Put(SfxUInt32Item(ATTR_SNAPLINE_Y, nYValue)); rOutAttrs.Put(SfxUInt32Item(ATTR_SNAPLINE_Y, nYValue));
} }
/*************************************************************************
|*
|* Gruppe mit Radiobutton verstecken
|*
\************************************************************************/
void SdSnapLineDlg::HideRadioGroup() void SdSnapLineDlg::HideRadioGroup()
{ {
aFlDir.Hide(); aFlDir.Hide();
...@@ -179,12 +164,9 @@ void SdSnapLineDlg::HideRadioGroup() ...@@ -179,12 +164,9 @@ void SdSnapLineDlg::HideRadioGroup()
aRbPoint.Hide(); aRbPoint.Hide();
} }
/************************************************************************* /**
|* * disable X or Y input fields
|* X- bzw. Y-Inputfeld disablen */
|*
\************************************************************************/
void SdSnapLineDlg::SetInputFields(sal_Bool bEnableX, sal_Bool bEnableY) void SdSnapLineDlg::SetInputFields(sal_Bool bEnableX, sal_Bool bEnableY)
{ {
if ( bEnableX ) if ( bEnableX )
......
...@@ -36,7 +36,7 @@ using namespace ::com::sun::star::uno; ...@@ -36,7 +36,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans; using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::frame; using namespace ::com::sun::star::frame;
// z.Z. werden von Joe nur die u.a. Moeglichkeiten unterstuetzt // at the moment, Joe only supports the methods specified below
#define ESCDIR_COUNT 5 #define ESCDIR_COUNT 5
static sal_uInt16 aEscDirArray[] = static sal_uInt16 aEscDirArray[] =
{ {
...@@ -58,12 +58,9 @@ static sal_uInt16 aEscDirArray[] = ...@@ -58,12 +58,9 @@ static sal_uInt16 aEscDirArray[] =
SFX_IMPL_TOOLBOX_CONTROL( SdTbxCtlGlueEscDir, SfxUInt16Item ) SFX_IMPL_TOOLBOX_CONTROL( SdTbxCtlGlueEscDir, SfxUInt16Item )
/************************************************************************* /**
|* * Constructor for clue point escape direction Listbox
|* Konstruktor fuer Klebepunkt-Autrittsrichtungs-Listbox */
|*
\************************************************************************/
GlueEscDirLB::GlueEscDirLB( Window* pParent, const Reference< XFrame >& rFrame ) : GlueEscDirLB::GlueEscDirLB( Window* pParent, const Reference< XFrame >& rFrame ) :
ListBox( pParent, WinBits( WB_BORDER | WB_DROPDOWN ) ), ListBox( pParent, WinBits( WB_BORDER | WB_DROPDOWN ) ),
m_xFrame( rFrame ) m_xFrame( rFrame )
...@@ -75,22 +72,13 @@ GlueEscDirLB::GlueEscDirLB( Window* pParent, const Reference< XFrame >& rFrame ) ...@@ -75,22 +72,13 @@ GlueEscDirLB::GlueEscDirLB( Window* pParent, const Reference< XFrame >& rFrame )
Show(); Show();
} }
/*************************************************************************
|*
|* Dtor
|*
\************************************************************************/
GlueEscDirLB::~GlueEscDirLB() GlueEscDirLB::~GlueEscDirLB()
{ {
} }
/************************************************************************* /**
|* * Determines the escape direction and sends the corresponding slot
|* Ermittelt die Austrittsrichtung und verschickt den entspr. Slot */
|*
\************************************************************************/
void GlueEscDirLB::Select() void GlueEscDirLB::Select()
{ {
sal_uInt16 nPos = GetSelectEntryPos(); sal_uInt16 nPos = GetSelectEntryPos();
...@@ -109,12 +97,9 @@ void GlueEscDirLB::Select() ...@@ -109,12 +97,9 @@ void GlueEscDirLB::Select()
} }
} }
/************************************************************************* /**
|* * Fills the Listbox with strings
|* Fuellen der Listbox mit Strings */
|*
\************************************************************************/
void GlueEscDirLB::Fill() void GlueEscDirLB::Fill()
{ {
InsertEntry( String( SdResId( STR_GLUE_ESCDIR_SMART ) ) ); InsertEntry( String( SdResId( STR_GLUE_ESCDIR_SMART ) ) );
...@@ -133,24 +118,18 @@ void GlueEscDirLB::Fill() ...@@ -133,24 +118,18 @@ void GlueEscDirLB::Fill()
*/ */
} }
/************************************************************************* /**
|* * Constructor for glue point escape direction toolbox control
|* Konstruktor fuer Klebepunkt-Autrittsrichtungs-Toolbox-Control */
|*
\************************************************************************/
SdTbxCtlGlueEscDir::SdTbxCtlGlueEscDir( SdTbxCtlGlueEscDir::SdTbxCtlGlueEscDir(
sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx ) SfxToolBoxControl( nSlotId, nId, rTbx )
{ {
} }
/************************************************************************* /**
|* * Represents state in the listbox of the controller
|* Stellt Status in der Listbox des Controllers dar */
|*
\************************************************************************/
void SdTbxCtlGlueEscDir::StateChanged( sal_uInt16 nSId, void SdTbxCtlGlueEscDir::StateChanged( sal_uInt16 nSId,
SfxItemState eState, const SfxPoolItem* pState ) SfxItemState eState, const SfxPoolItem* pState )
{ {
...@@ -195,12 +174,9 @@ Window* SdTbxCtlGlueEscDir::CreateItemWindow( Window *pParent ) ...@@ -195,12 +174,9 @@ Window* SdTbxCtlGlueEscDir::CreateItemWindow( Window *pParent )
} }
/************************************************************************* /**
|* * Returns position in the array for EscDir (Mapping for Listbox)
|* Liefert Position im Array fuer EscDir zurueck (Mapping fuer Listbox) */
|*
\************************************************************************/
sal_uInt16 SdTbxCtlGlueEscDir::GetEscDirPos( sal_uInt16 nEscDir ) sal_uInt16 SdTbxCtlGlueEscDir::GetEscDirPos( sal_uInt16 nEscDir )
{ {
for( sal_uInt16 i = 0; i < ESCDIR_COUNT; i++ ) for( sal_uInt16 i = 0; i < ESCDIR_COUNT; i++ )
......
...@@ -399,7 +399,7 @@ void HeaderFooterDialog::apply( bool bToAll, bool bForceSlides ) ...@@ -399,7 +399,7 @@ void HeaderFooterDialog::apply( bool bToAll, bool bForceSlides )
change( pUndoGroup, mpDoc->GetMasterSdPage( 0, PK_HANDOUT ), aNewSettings ); change( pUndoGroup, mpDoc->GetMasterSdPage( 0, PK_HANDOUT ), aNewSettings );
} }
// Undo Gruppe dem Undo Manager uebergeben // give the undo group to the undo manager
mpViewShell->GetViewFrame()->GetObjectShell()->GetUndoManager()->AddUndoAction(pUndoGroup); mpViewShell->GetViewFrame()->GetObjectShell()->GetUndoManager()->AddUndoAction(pUndoGroup);
} }
......
...@@ -34,12 +34,6 @@ ...@@ -34,12 +34,6 @@
#include "inspagob.hrc" #include "inspagob.hrc"
/*************************************************************************
|*
|* Ctor
|*
\************************************************************************/
SdInsertPagesObjsDlg::SdInsertPagesObjsDlg( SdInsertPagesObjsDlg::SdInsertPagesObjsDlg(
::Window* pWindow, ::Window* pWindow,
const SdDrawDocument* pInDoc, const SdDrawDocument* pInDoc,
...@@ -62,30 +56,22 @@ SdInsertPagesObjsDlg::SdInsertPagesObjsDlg( ...@@ -62,30 +56,22 @@ SdInsertPagesObjsDlg::SdInsertPagesObjsDlg(
aLbTree.SetSelectHdl( LINK( this, SdInsertPagesObjsDlg, SelectObjectHdl ) ); aLbTree.SetSelectHdl( LINK( this, SdInsertPagesObjsDlg, SelectObjectHdl ) );
// Text wird eingefuegt // insert text
if( !pMedium ) if( !pMedium )
SetText( String( SdResId( STR_INSERT_TEXT ) ) ); SetText( String( SdResId( STR_INSERT_TEXT ) ) );
Reset(); Reset();
} }
/*************************************************************************
|*
|* Dtor
|*
\************************************************************************/
SdInsertPagesObjsDlg::~SdInsertPagesObjsDlg() SdInsertPagesObjsDlg::~SdInsertPagesObjsDlg()
{ {
} }
/************************************************************************* /**
|* * Fills the TreeLB dependent on the medium. Is not medium available, then
|* Fuellt die TreeLB in Abhaengigkeit des Mediums. Ist kein Medium * it is a text and not a draw document.
|* vorhanden, handelt es sich um ein Text- und kein Drawdokument */
|*
\************************************************************************/
void SdInsertPagesObjsDlg::Reset() void SdInsertPagesObjsDlg::Reset()
{ {
if( pMedium ) if( pMedium )
...@@ -108,16 +94,15 @@ void SdInsertPagesObjsDlg::Reset() ...@@ -108,16 +94,15 @@ void SdInsertPagesObjsDlg::Reset()
std::vector<rtl::OUString> SdInsertPagesObjsDlg::GetList( const sal_uInt16 nType ) std::vector<rtl::OUString> SdInsertPagesObjsDlg::GetList( const sal_uInt16 nType )
{ {
// Bei Draw-Dokumenten muss bei der Selektion des Dokumentes NULL // With Draw documents, we have to return NULL on selection of the document
// zurueckgegeben werden
if( pMedium ) if( pMedium )
{ {
// Um zu gewaehrleisten, dass die Bookmarks geoeffnet sind // to ensure that bookmarks are opened
// (Wenn gesamtes Dokument ausgewaehlt wurde) // (when the whole document is selected)
aLbTree.GetBookmarkDoc(); aLbTree.GetBookmarkDoc();
// Wenn das Dokument (mit-)selektiert oder nichst selektiert ist, // If the document is selected (too) or nothing is selected,
// wird das gesamte Dokument (und nicht mehr!) eingefuegt. // the whole document is inserted (but not more!)
if( aLbTree.GetSelectionCount() == 0 || if( aLbTree.GetSelectionCount() == 0 ||
( aLbTree.IsSelected( aLbTree.First() ) ) ) ( aLbTree.IsSelected( aLbTree.First() ) ) )
return std::vector<rtl::OUString>(); return std::vector<rtl::OUString>();
...@@ -126,34 +111,25 @@ std::vector<rtl::OUString> SdInsertPagesObjsDlg::GetList( const sal_uInt16 nType ...@@ -126,34 +111,25 @@ std::vector<rtl::OUString> SdInsertPagesObjsDlg::GetList( const sal_uInt16 nType
return aLbTree.GetSelectEntryList( nType ); return aLbTree.GetSelectEntryList( nType );
} }
/************************************************************************* /**
|* * is link checked
|* Ist Verknuepfung gechecked */
|*
\************************************************************************/
sal_Bool SdInsertPagesObjsDlg::IsLink() sal_Bool SdInsertPagesObjsDlg::IsLink()
{ {
return( aCbxLink.IsChecked() ); return( aCbxLink.IsChecked() );
} }
/************************************************************************* /**
|* * is link checked
|* Ist Verknuepfung gechecked */
|*
\************************************************************************/
sal_Bool SdInsertPagesObjsDlg::IsRemoveUnnessesaryMasterPages() const sal_Bool SdInsertPagesObjsDlg::IsRemoveUnnessesaryMasterPages() const
{ {
return( aCbxMasters.IsChecked() ); return( aCbxMasters.IsChecked() );
} }
/************************************************************************* /**
|* * Enabled and selects end-color-LB
|* Enabled und selektiert Endfarben-LB */
|*
\************************************************************************/
IMPL_LINK_NOARG(SdInsertPagesObjsDlg, SelectObjectHdl) IMPL_LINK_NOARG(SdInsertPagesObjsDlg, SelectObjectHdl)
{ {
if( aLbTree.IsLinkableSelected() ) if( aLbTree.IsLinkableSelected() )
......
This diff is collapsed.
...@@ -41,9 +41,7 @@ using namespace ::com::sun::star::lang; ...@@ -41,9 +41,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::container; using namespace ::com::sun::star::container;
using namespace ::com::sun::star::beans; using namespace ::com::sun::star::beans;
/*************************************************************************
|* Ctor
\************************************************************************/
SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow, SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow,
const SfxItemSet& rInAttrs, const SfxItemSet& rInAttrs,
const std::vector<String> &rPageNames, SdCustomShowList* pCSList ) : const std::vector<String> &rPageNames, SdCustomShowList* pCSList ) :
...@@ -109,7 +107,7 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow, ...@@ -109,7 +107,7 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow,
aTmfPause.SetAccessibleRelationLabeledBy( &aRbtAuto ); aTmfPause.SetAccessibleRelationLabeledBy( &aRbtAuto );
aTmfPause.SetAccessibleName(aRbtAuto.GetText()); aTmfPause.SetAccessibleName(aRbtAuto.GetText());
// Listbox mit Seitennamen fuellen // fill Listbox with page names
for (std::vector<String>::const_iterator pIter = rPageNames.begin(); pIter != rPageNames.end(); ++pIter) for (std::vector<String>::const_iterator pIter = rPageNames.begin(); pIter != rPageNames.end(); ++pIter)
aLbDias.InsertEntry(*pIter); aLbDias.InsertEntry(*pIter);
...@@ -117,7 +115,7 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow, ...@@ -117,7 +115,7 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow,
{ {
sal_uInt16 nPosToSelect = (sal_uInt16) pCustomShowList->GetCurPos(); sal_uInt16 nPosToSelect = (sal_uInt16) pCustomShowList->GetCurPos();
SdCustomShow* pCustomShow; SdCustomShow* pCustomShow;
// Listbox mit CustomShows fuellen // fill Listbox with CustomShows
for( pCustomShow = (SdCustomShow*) pCustomShowList->First(); for( pCustomShow = (SdCustomShow*) pCustomShowList->First();
pCustomShow != NULL; pCustomShow != NULL;
pCustomShow = (SdCustomShow*) pCustomShowList->Next() ) pCustomShow = (SdCustomShow*) pCustomShowList->Next() )
...@@ -243,9 +241,9 @@ void SdStartPresentationDlg::InitMonitorSettings() ...@@ -243,9 +241,9 @@ void SdStartPresentationDlg::InitMonitorSettings()
} }
} }
/************************************************************************* /**
|* Setzt die ausgewaehlten Attribute des Dialogs * sets the selected attributes of the dialog
\************************************************************************/ */
void SdStartPresentationDlg::GetAttr( SfxItemSet& rAttr ) void SdStartPresentationDlg::GetAttr( SfxItemSet& rAttr )
{ {
rAttr.Put( SfxBoolItem ( ATTR_PRESENT_ALL, aRbtAll.IsChecked() ) ); rAttr.Put( SfxBoolItem ( ATTR_PRESENT_ALL, aRbtAll.IsChecked() ) );
...@@ -272,9 +270,9 @@ void SdStartPresentationDlg::GetAttr( SfxItemSet& rAttr ) ...@@ -272,9 +270,9 @@ void SdStartPresentationDlg::GetAttr( SfxItemSet& rAttr )
pCustomShowList->Seek( nPos ); pCustomShowList->Seek( nPos );
} }
/************************************************************************* /**
|* Handler: Enabled/Disabled Listbox "Dias" * Handler: Enabled/Disabled Listbox "Dias"
\************************************************************************/ */
IMPL_LINK_NOARG(SdStartPresentationDlg, ChangeRangeHdl) IMPL_LINK_NOARG(SdStartPresentationDlg, ChangeRangeHdl)
{ {
aLbDias.Enable( aRbtAtDia.IsChecked() ); aLbDias.Enable( aRbtAtDia.IsChecked() );
...@@ -283,9 +281,9 @@ IMPL_LINK_NOARG(SdStartPresentationDlg, ChangeRangeHdl) ...@@ -283,9 +281,9 @@ IMPL_LINK_NOARG(SdStartPresentationDlg, ChangeRangeHdl)
return( 0L ); return( 0L );
} }
/************************************************************************* /**
|* Handler: Enabled/Disabled Checkbox "AlwaysOnTop" * Handler: Enabled/Disabled Checkbox "AlwaysOnTop"
\************************************************************************/ */
IMPL_LINK_NOARG(SdStartPresentationDlg, ClickWindowPresentationHdl) IMPL_LINK_NOARG(SdStartPresentationDlg, ClickWindowPresentationHdl)
{ {
const bool bAuto = aRbtAuto.IsChecked(); const bool bAuto = aRbtAuto.IsChecked();
...@@ -310,9 +308,9 @@ IMPL_LINK_NOARG(SdStartPresentationDlg, ClickWindowPresentationHdl) ...@@ -310,9 +308,9 @@ IMPL_LINK_NOARG(SdStartPresentationDlg, ClickWindowPresentationHdl)
return( 0L ); return( 0L );
} }
/************************************************************************* /**
|* Handler: Enabled/Disabled Checkbox "AlwaysOnTop" * Handler: Enabled/Disabled Checkbox "AlwaysOnTop"
\************************************************************************/ */
IMPL_LINK_NOARG(SdStartPresentationDlg, ChangePauseHdl) IMPL_LINK_NOARG(SdStartPresentationDlg, ChangePauseHdl)
{ {
aCbxAutoLogo.Enable( aRbtAuto.IsChecked() && ( aTmfPause.GetTime().GetMSFromTime() > 0 ) ); aCbxAutoLogo.Enable( aRbtAuto.IsChecked() && ( aTmfPause.GetTime().GetMSFromTime() > 0 ) );
......
...@@ -50,12 +50,9 @@ ...@@ -50,12 +50,9 @@
#include "drawdoc.hxx" #include "drawdoc.hxx"
#define IS_OUTLINE(x) (x >= PO_OUTLINE_1 && x <= PO_OUTLINE_9) #define IS_OUTLINE(x) (x >= PO_OUTLINE_1 && x <= PO_OUTLINE_9)
/************************************************************************* /**
|* * Constructor of Tab dialog: appends pages to the dialog
|* Konstruktor des Tab-Dialogs: Fuegt die Seiten zum Dialog hinzu */
|*
\************************************************************************/
SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
Window* pParent, Window* pParent,
SdResId DlgId, SdResId DlgId,
...@@ -71,7 +68,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ...@@ -71,7 +68,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
{ {
if( IS_OUTLINE(ePO)) if( IS_OUTLINE(ePO))
{ {
// Leider sind die Itemsets unserer Stylesheets nicht discret.. // Unfortunately, the Itemsets of our style sheets are not discreet..
const sal_uInt16* pPtr = pOrgSet->GetRanges(); const sal_uInt16* pPtr = pOrgSet->GetRanges();
sal_uInt16 p1, p2; sal_uInt16 p1, p2;
while( *pPtr ) while( *pPtr )
...@@ -79,7 +76,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ...@@ -79,7 +76,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
p1 = pPtr[0]; p1 = pPtr[0];
p2 = pPtr[1]; p2 = pPtr[1];
// erstmal das ganze discret machen // first, we make it discreet
while(pPtr[2] && (pPtr[2] - p2 == 1)) while(pPtr[2] && (pPtr[2] - p2 == 1))
{ {
p2 = pPtr[3]; p2 = pPtr[3];
...@@ -101,8 +98,8 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ...@@ -101,8 +98,8 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
const SfxPoolItem *pItem = NULL; const SfxPoolItem *pItem = NULL;
// Fals in diesem Stylesheet kein Bullet Item ist, holen wir uns // If there is no bullet item in this stylesheet, we get it
// das aus dem 'Outline 1' Stylesheet. // from 'Outline 1' style sheet.
if( SFX_ITEM_SET != aInputSet.GetItemState(EE_PARA_NUMBULLET, sal_False, &pItem )) if( SFX_ITEM_SET != aInputSet.GetItemState(EE_PARA_NUMBULLET, sal_False, &pItem ))
{ {
String aStyleName((SdResId(STR_PSEUDOSHEET_OUTLINE))); String aStyleName((SdResId(STR_PSEUDOSHEET_OUTLINE)));
...@@ -114,7 +111,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ...@@ -114,7 +111,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
aInputSet.Put( *pItem ); aInputSet.Put( *pItem );
} }
// gewaehlte Ebene im Dialog vorselektieren // preselect selected layer in dialog
aInputSet.Put( SfxUInt16Item( SID_PARAM_CUR_NUM_LEVEL, 1<<GetOutlineLevel())); aInputSet.Put( SfxUInt16Item( SID_PARAM_CUR_NUM_LEVEL, 1<<GetOutlineLevel()));
SetInputSet( &aInputSet ); SetInputSet( &aInputSet );
...@@ -182,8 +179,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ...@@ -182,8 +179,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
AddTabPage( RID_SVXPAGE_ALIGN_PARAGRAPH ); AddTabPage( RID_SVXPAGE_ALIGN_PARAGRAPH );
} }
// Titel setzen und // set title and add corresponding pages to dialog
// entsprechende Seiten zum Dialog hinzufuegen
OUString aTitle; OUString aTitle;
switch( ePO ) switch( ePO )
...@@ -223,7 +219,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ...@@ -223,7 +219,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
} }
SetText( aTitle ); SetText( aTitle );
nDlgType = 1; // Vorlagen-Dialog nDlgType = 1; // template dialog
nPageType = 0; nPageType = 0;
nPos = 0; nPos = 0;
...@@ -335,7 +331,7 @@ sal_uInt16 SdPresLayoutTemplateDlg::GetOutlineLevel() const ...@@ -335,7 +331,7 @@ sal_uInt16 SdPresLayoutTemplateDlg::GetOutlineLevel() const
case PO_OUTLINE_8: return 7; case PO_OUTLINE_8: return 7;
case PO_OUTLINE_9: return 8; case PO_OUTLINE_9: return 8;
default: default:
DBG_ASSERT( sal_False, "Falscher Po! [CL]"); DBG_ASSERT( sal_False, "Wrong Po! [CL]");
} }
return 0; return 0;
} }
......
...@@ -32,12 +32,9 @@ ...@@ -32,12 +32,9 @@
#include <svl/intitem.hxx> #include <svl/intitem.hxx>
#include <sfx2/request.hxx> #include <sfx2/request.hxx>
/************************************************************************* /**
|* * dialog to adjust print options
|* Dialog zum Aendern der Print-Optionen */
|*
\************************************************************************/
SdPrintOptions::SdPrintOptions( Window* pParent, const SfxItemSet& rInAttrs ) : SdPrintOptions::SdPrintOptions( Window* pParent, const SfxItemSet& rInAttrs ) :
SfxTabPage ( pParent, SdResId( TP_PRINT_OPTIONS ), rInAttrs ), SfxTabPage ( pParent, SdResId( TP_PRINT_OPTIONS ), rInAttrs ),
......
...@@ -39,12 +39,6 @@ ...@@ -39,12 +39,6 @@
#define DOCUMENT_TOKEN (sal_Unicode('#')) #define DOCUMENT_TOKEN (sal_Unicode('#'))
/*************************************************************************
|*
|* Konstruktor
|*
\************************************************************************/
SdPresLayoutDlg::SdPresLayoutDlg( SdPresLayoutDlg::SdPresLayoutDlg(
::sd::DrawDocShell* pDocShell, ::sd::DrawDocShell* pDocShell,
::Window* pWindow, ::Window* pWindow,
...@@ -70,28 +64,19 @@ SdPresLayoutDlg::SdPresLayoutDlg( ...@@ -70,28 +64,19 @@ SdPresLayoutDlg::SdPresLayoutDlg(
Reset(); Reset();
} }
/*************************************************************************
|*
|* Dtor
|*
*************************************************************************/
SdPresLayoutDlg::~SdPresLayoutDlg() SdPresLayoutDlg::~SdPresLayoutDlg()
{ {
} }
/************************************************************************* /**
|* * Initialize
|* Initialisierung */
|*
*************************************************************************/
void SdPresLayoutDlg::Reset() void SdPresLayoutDlg::Reset()
{ {
const SfxPoolItem *pPoolItem = NULL; const SfxPoolItem *pPoolItem = NULL;
long nName; long nName;
// MasterPage austauschen // replace master page
if( mrOutAttrs.GetItemState( ATTR_PRESLAYOUT_MASTER_PAGE, sal_False, &pPoolItem ) == SFX_ITEM_SET ) if( mrOutAttrs.GetItemState( ATTR_PRESLAYOUT_MASTER_PAGE, sal_False, &pPoolItem ) == SFX_ITEM_SET )
{ {
sal_Bool bMasterPage = ( (const SfxBoolItem*) pPoolItem)->GetValue(); sal_Bool bMasterPage = ( (const SfxBoolItem*) pPoolItem)->GetValue();
...@@ -99,7 +84,7 @@ void SdPresLayoutDlg::Reset() ...@@ -99,7 +84,7 @@ void SdPresLayoutDlg::Reset()
maCbxMasterPage.Check( bMasterPage ); maCbxMasterPage.Check( bMasterPage );
} }
// Nicht verwendete MasterPages entfernen // remove not used master pages
maCbxCheckMasters.Check(sal_False); maCbxCheckMasters.Check(sal_False);
if(mrOutAttrs.GetItemState(ATTR_PRESLAYOUT_NAME, sal_True, &pPoolItem) == SFX_ITEM_SET) if(mrOutAttrs.GetItemState(ATTR_PRESLAYOUT_NAME, sal_True, &pPoolItem) == SFX_ITEM_SET)
...@@ -115,18 +100,15 @@ void SdPresLayoutDlg::Reset() ...@@ -115,18 +100,15 @@ void SdPresLayoutDlg::Reset()
if (maLayoutNames[nName] == maName) if (maLayoutNames[nName] == maName)
break; break;
} }
DBG_ASSERT(nName < mnLayoutCount, "Layout nicht gefunden"); DBG_ASSERT(nName < mnLayoutCount, "Layout not found");
maVS.SelectItem((sal_uInt16)nName + 1); // Inizes des ValueSets beginnen bei 1 maVS.SelectItem((sal_uInt16)nName + 1); // Indices of the ValueSets start at 1
} }
/************************************************************************* /**
|* * Fills the provided Item-Set with dialog box attributes
|* Fuellt uebergebenen Item-Set mit Dialogbox-Attributen */
|*
*************************************************************************/
void SdPresLayoutDlg::GetAttr(SfxItemSet& rOutAttrs) void SdPresLayoutDlg::GetAttr(SfxItemSet& rOutAttrs)
{ {
short nId = maVS.GetSelectItemId(); short nId = maVS.GetSelectItemId();
...@@ -145,7 +127,7 @@ void SdPresLayoutDlg::GetAttr(SfxItemSet& rOutAttrs) ...@@ -145,7 +127,7 @@ void SdPresLayoutDlg::GetAttr(SfxItemSet& rOutAttrs)
{ {
aLayoutName = maLayoutNames[ nId - 1 ]; aLayoutName = maLayoutNames[ nId - 1 ];
if( aLayoutName == maStrNone ) if( aLayoutName == maStrNone )
aLayoutName.Erase(); // so wird "- keine -" codiert (s.u.) aLayoutName.Erase(); // that way we encode "- nothing -" (see below)
} }
rOutAttrs.Put( SfxStringItem( ATTR_PRESLAYOUT_NAME, aLayoutName ) ); rOutAttrs.Put( SfxStringItem( ATTR_PRESLAYOUT_NAME, aLayoutName ) );
...@@ -154,12 +136,9 @@ void SdPresLayoutDlg::GetAttr(SfxItemSet& rOutAttrs) ...@@ -154,12 +136,9 @@ void SdPresLayoutDlg::GetAttr(SfxItemSet& rOutAttrs)
} }
/************************************************************************* /**
|* * Fills ValueSet with bitmaps
|* Fuellt das ValueSet mit Bitmaps */
|*
\************************************************************************/
void SdPresLayoutDlg::FillValueSet() void SdPresLayoutDlg::FillValueSet()
{ {
maVS.SetStyle(maVS.GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER maVS.SetStyle(maVS.GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER
...@@ -191,24 +170,18 @@ void SdPresLayoutDlg::FillValueSet() ...@@ -191,24 +170,18 @@ void SdPresLayoutDlg::FillValueSet()
} }
/************************************************************************* /**
|* * DoubleClick handler
|* Doppelklick-Handler */
|*
\************************************************************************/
IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLayoutHdl) IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLayoutHdl)
{ {
EndDialog(RET_OK); EndDialog(RET_OK);
return 0; return 0;
} }
/************************************************************************* /**
|* * Click handler for load button
|* Klick-Handler fuer Laden-Button */
|*
\************************************************************************/
IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl) IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl)
{ {
SfxNewFileDialog* pDlg = new SfxNewFileDialog(this, SFXWB_PREVIEW); SfxNewFileDialog* pDlg = new SfxNewFileDialog(this, SFXWB_PREVIEW);
...@@ -236,7 +209,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl) ...@@ -236,7 +209,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl)
} }
else else
{ {
// so wird "- keine -" codiert // that way we encode "- nothing -"
maName.Erase(); maName.Erase();
} }
} }
...@@ -249,7 +222,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl) ...@@ -249,7 +222,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl)
if( !bCancel ) if( !bCancel )
{ {
// Pruefen, ob Vorlage schon vorhanden // check if template already ecists
sal_Bool bExists = sal_False; sal_Bool bExists = sal_False;
String aCompareStr( maName ); String aCompareStr( maName );
if( maName.Len() == 0 ) if( maName.Len() == 0 )
...@@ -262,17 +235,17 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl) ...@@ -262,17 +235,17 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl)
if( aCompareStr == *it ) if( aCompareStr == *it )
{ {
bExists = sal_True; bExists = sal_True;
// Vorlage selektieren // select template
maVS.SelectItem( aPos + 1 ); maVS.SelectItem( aPos + 1 );
} }
} }
if( !bExists ) if( !bExists )
{ {
// Dokument laden um Preview-Bitmap zu ermitteln (wenn Vorlage ausgewaehlt) // load document in order to determine preview bitmap (if template is selected)
if( maName.Len() ) if( maName.Len() )
{ {
// Dokument ermitteln, um OpenBookmarkDoc rufen zu koennen // determine document in order to call OpenBookmarkDoc
SdDrawDocument* pDoc = mpDocSh->GetDoc(); SdDrawDocument* pDoc = mpDocSh->GetDoc();
SdDrawDocument* pTemplDoc = pDoc->OpenBookmarkDoc( maName ); SdDrawDocument* pTemplDoc = pDoc->OpenBookmarkDoc( maName );
...@@ -305,7 +278,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl) ...@@ -305,7 +278,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl)
} }
else else
{ {
// leeres Layout // empty layout
maLayoutNames.push_back( new String( maStrNone ) ); maLayoutNames.push_back( new String( maStrNone ) );
maVS.InsertItem( (sal_uInt16) maLayoutNames.size(), maVS.InsertItem( (sal_uInt16) maLayoutNames.size(),
Bitmap( SdResId( BMP_FOIL_NONE ) ), maStrNone ); Bitmap( SdResId( BMP_FOIL_NONE ) ), maStrNone );
...@@ -313,7 +286,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl) ...@@ -313,7 +286,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl)
if (!bCancel) if (!bCancel)
{ {
// Vorlage selektieren // select template
maVS.SelectItem( (sal_uInt16) maLayoutNames.size() ); maVS.SelectItem( (sal_uInt16) maLayoutNames.size() );
} }
} }
......
This diff is collapsed.
...@@ -49,12 +49,9 @@ ...@@ -49,12 +49,9 @@
#include "paragr.hxx" #include "paragr.hxx"
#include <svx/flagsdef.hxx> #include <svx/flagsdef.hxx>
/************************************************************************* /**
|* * Constructor of the Tab dialog: appends pages to the dialog
|* Konstruktor des Tab-Dialogs: Fuegt die Seiten zum Dialog hinzu */
|*
\************************************************************************/
SdTabTemplateDlg::SdTabTemplateDlg( Window* pParent, SdTabTemplateDlg::SdTabTemplateDlg( Window* pParent,
const SfxObjectShell* pDocShell, const SfxObjectShell* pDocShell,
SfxStyleSheetBase& rStyleBase, SfxStyleSheetBase& rStyleBase,
...@@ -72,7 +69,7 @@ SdTabTemplateDlg::SdTabTemplateDlg( Window* pParent, ...@@ -72,7 +69,7 @@ SdTabTemplateDlg::SdTabTemplateDlg( Window* pParent,
{ {
FreeResource(); FreeResource();
// Listbox fuellen und Select-Handler ueberladen // fill Listbox and overload Select-Handler
AddTabPage( RID_SVXPAGE_LINE); AddTabPage( RID_SVXPAGE_LINE);
AddTabPage( RID_SVXPAGE_AREA); AddTabPage( RID_SVXPAGE_AREA);
......
...@@ -25,7 +25,7 @@ TabDialog TAB_TEMPLATE ...@@ -25,7 +25,7 @@ TabDialog TAB_TEMPLATE
Size = MAP_APPFONT ( 289 , 176 ) ; Size = MAP_APPFONT ( 289 , 176 ) ;
Text [ en-US ] = "Graphics Styles" ; Text [ en-US ] = "Graphics Styles" ;
Moveable = TRUE ; Moveable = TRUE ;
// Closeable = TRUE; // Dieser Dialog hat OK und/oder Cancel Button ! (KH) // Closeable = TRUE; // This dialog has an OK and/or a Cancel button! (KH)
TabControl 1 TabControl 1
{ {
OutputSize = TRUE ; OutputSize = TRUE ;
......
...@@ -78,12 +78,9 @@ using namespace com::sun::star::lang; ...@@ -78,12 +78,9 @@ using namespace com::sun::star::lang;
#define DOCUMENT_TOKEN (sal_Unicode('#')) #define DOCUMENT_TOKEN (sal_Unicode('#'))
/************************************************************************* /**
|* * Constructor of the Tab dialog: appends the pages to the dialog
|* Konstruktor des Tab-Dialogs: Fuegt die Seiten zum Dialog hinzu */
|*
\************************************************************************/
SdActionDlg::SdActionDlg ( SdActionDlg::SdActionDlg (
::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) : ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) :
SfxNoLayoutSingleTabDialog ( pParent, *pAttr, TP_ANIMATION_ACTION ), SfxNoLayoutSingleTabDialog ( pParent, *pAttr, TP_ANIMATION_ACTION ),
...@@ -91,9 +88,9 @@ SdActionDlg::SdActionDlg ( ...@@ -91,9 +88,9 @@ SdActionDlg::SdActionDlg (
{ {
// FreeResource(); // FreeResource();
SfxTabPage* pNewPage = SdTPAction::Create( this, rOutAttrs ); SfxTabPage* pNewPage = SdTPAction::Create( this, rOutAttrs );
DBG_ASSERT( pNewPage, "Seite konnte nicht erzeugt werden"); DBG_ASSERT( pNewPage, "Unable to create page");
// Ehemals in PageCreated // formerly in PageCreated
( (SdTPAction*) pNewPage )->SetView( pView ); ( (SdTPAction*) pNewPage )->SetView( pView );
( (SdTPAction*) pNewPage )->Construct(); ( (SdTPAction*) pNewPage )->Construct();
...@@ -105,12 +102,9 @@ SdActionDlg::SdActionDlg ( ...@@ -105,12 +102,9 @@ SdActionDlg::SdActionDlg (
} }
/************************************************************************* /**
|* * Action-TabPage
|* Action-TabPage */
|*
\************************************************************************/
SdTPAction::SdTPAction( Window* pWindow, const SfxItemSet& rInAttrs ) : SdTPAction::SdTPAction( Window* pWindow, const SfxItemSet& rInAttrs ) :
SfxTabPage ( pWindow, SdResId( TP_ANIMATION ), rInAttrs ), SfxTabPage ( pWindow, SdResId( TP_ANIMATION ), rInAttrs ),
...@@ -142,7 +136,7 @@ SdTPAction::SdTPAction( Window* pWindow, const SfxItemSet& rInAttrs ) : ...@@ -142,7 +136,7 @@ SdTPAction::SdTPAction( Window* pWindow, const SfxItemSet& rInAttrs ) :
aBtnSearch.SetClickHdl( LINK( this, SdTPAction, ClickSearchHdl ) ); aBtnSearch.SetClickHdl( LINK( this, SdTPAction, ClickSearchHdl ) );
aBtnSeek.SetClickHdl( LINK( this, SdTPAction, ClickSearchHdl ) ); aBtnSeek.SetClickHdl( LINK( this, SdTPAction, ClickSearchHdl ) );
// diese Page braucht ExchangeSupport // this page needs ExchangeSupport
SetExchangeSupport(); SetExchangeSupport();
aLbAction.SetSelectHdl( LINK( this, SdTPAction, ClickActionHdl ) ); aLbAction.SetSelectHdl( LINK( this, SdTPAction, ClickActionHdl ) );
...@@ -150,7 +144,7 @@ SdTPAction::SdTPAction( Window* pWindow, const SfxItemSet& rInAttrs ) : ...@@ -150,7 +144,7 @@ SdTPAction::SdTPAction( Window* pWindow, const SfxItemSet& rInAttrs ) :
aEdtDocument.SetLoseFocusHdl( LINK( this, SdTPAction, CheckFileHdl ) ); aEdtDocument.SetLoseFocusHdl( LINK( this, SdTPAction, CheckFileHdl ) );
aEdtMacro.SetLoseFocusHdl( LINK( this, SdTPAction, CheckFileHdl ) ); aEdtMacro.SetLoseFocusHdl( LINK( this, SdTPAction, CheckFileHdl ) );
// Controls enablen // enable controls
aFtAction.Show(); aFtAction.Show();
aLbAction.Show(); aLbAction.Show();
...@@ -169,7 +163,7 @@ void SdTPAction::SetView( const ::sd::View* pSdView ) ...@@ -169,7 +163,7 @@ void SdTPAction::SetView( const ::sd::View* pSdView )
{ {
mpView = pSdView; mpView = pSdView;
// Holen der ColorTable und Fuellen der ListBox // get ColorTable and fill ListBox
::sd::DrawDocShell* pDocSh = static_cast<const ::sd::View*>(mpView)->GetDocSh(); ::sd::DrawDocShell* pDocSh = static_cast<const ::sd::View*>(mpView)->GetDocSh();
if( pDocSh && pDocSh->GetViewShell() ) if( pDocSh && pDocSh->GetViewShell() )
{ {
...@@ -180,7 +174,7 @@ void SdTPAction::SetView( const ::sd::View* pSdView ) ...@@ -180,7 +174,7 @@ void SdTPAction::SetView( const ::sd::View* pSdView )
SvxColorListItem aItem( *(const SvxColorListItem*)( pDocSh->GetItem( SID_COLOR_TABLE ) ) ); SvxColorListItem aItem( *(const SvxColorListItem*)( pDocSh->GetItem( SID_COLOR_TABLE ) ) );
pColList = aItem.GetColorList(); pColList = aItem.GetColorList();
DBG_ASSERT( pColList.is(), "Keine Farbtabelle vorhanden!" ); DBG_ASSERT( pColList.is(), "No color table available!" );
} }
else else
{ {
...@@ -192,7 +186,7 @@ void SdTPAction::SetView( const ::sd::View* pSdView ) ...@@ -192,7 +186,7 @@ void SdTPAction::SetView( const ::sd::View* pSdView )
void SdTPAction::Construct() void SdTPAction::Construct()
{ {
// OLE-Actionlistbox auffuellen // fill OLE-Actionlistbox
SdrOle2Obj* pOleObj = NULL; SdrOle2Obj* pOleObj = NULL;
SdrGrafObj* pGrafObj = NULL; SdrGrafObj* pGrafObj = NULL;
sal_Bool bOLEAction = sal_False; sal_Bool bOLEAction = sal_False;
...@@ -271,7 +265,7 @@ void SdTPAction::Construct() ...@@ -271,7 +265,7 @@ void SdTPAction::Construct()
maCurrentActions.push_back( presentation::ClickAction_MACRO ); maCurrentActions.push_back( presentation::ClickAction_MACRO );
maCurrentActions.push_back( presentation::ClickAction_STOPPRESENTATION ); maCurrentActions.push_back( presentation::ClickAction_STOPPRESENTATION );
// Action-Listbox fuellen // fill Action-Listbox
for (size_t nAction = 0, n = maCurrentActions.size(); nAction < n; nAction++) for (size_t nAction = 0, n = maCurrentActions.size(); nAction < n; nAction++)
{ {
sal_uInt16 nRId = GetClickActionSdResId( maCurrentActions[ nAction ] ); sal_uInt16 nRId = GetClickActionSdResId( maCurrentActions[ nAction ] );
...@@ -414,7 +408,7 @@ void SdTPAction::UpdateTree() ...@@ -414,7 +408,7 @@ void SdTPAction::UpdateTree()
void SdTPAction::OpenFileDialog() void SdTPAction::OpenFileDialog()
{ {
// Soundpreview nur fuer Interaktionen mit Sound // Soundpreview only for interaction with sound
presentation::ClickAction eCA = GetActualClickAction(); presentation::ClickAction eCA = GetActualClickAction();
sal_Bool bSound = ( eCA == presentation::ClickAction_SOUND ); sal_Bool bSound = ( eCA == presentation::ClickAction_SOUND );
sal_Bool bPage = ( eCA == presentation::ClickAction_BOOKMARK ); sal_Bool bPage = ( eCA == presentation::ClickAction_BOOKMARK );
...@@ -424,7 +418,7 @@ void SdTPAction::OpenFileDialog() ...@@ -424,7 +418,7 @@ void SdTPAction::OpenFileDialog()
if( bPage ) if( bPage )
{ {
// Es wird in der TreeLB nach dem eingegebenen Objekt gesucht // search in the TreeLB for the specified object
aLbTree.SelectEntry( GetEditText() ); aLbTree.SelectEntry( GetEditText() );
} }
else else
...@@ -693,7 +687,7 @@ IMPL_LINK_NOARG(SdTPAction, CheckFileHdl) ...@@ -693,7 +687,7 @@ IMPL_LINK_NOARG(SdTPAction, CheckFileHdl)
if( aFile != aLastFile ) if( aFile != aLastFile )
{ {
// Ueberpruefen, ob es eine gueltige Draw-Datei ist // check if it is a valid draw file
SfxMedium aMedium( aFile, SfxMedium aMedium( aFile,
STREAM_READ | STREAM_NOCREATE ); STREAM_READ | STREAM_NOCREATE );
...@@ -701,10 +695,10 @@ IMPL_LINK_NOARG(SdTPAction, CheckFileHdl) ...@@ -701,10 +695,10 @@ IMPL_LINK_NOARG(SdTPAction, CheckFileHdl)
{ {
WaitObject aWait( GetParentDialog() ); WaitObject aWait( GetParentDialog() );
// ist es eine Draw-Datei? // is it a draw file?
// mit READ oeffnen, sonst schreiben die Storages evtl. in die Datei! // open with READ, otherwise the Storages might write into the file!
uno::Reference < embed::XStorage > xStorage = aMedium.GetStorage(); uno::Reference < embed::XStorage > xStorage = aMedium.GetStorage();
DBG_ASSERT( xStorage.is(), "Kein Storage!" ); DBG_ASSERT( xStorage.is(), "No storage!" );
uno::Reference < container::XNameAccess > xAccess( xStorage, uno::UNO_QUERY ); uno::Reference < container::XNameAccess > xAccess( xStorage, uno::UNO_QUERY );
if( xAccess.is() && if( xAccess.is() &&
...@@ -906,7 +900,7 @@ sal_uInt16 SdTPAction::GetClickActionSdResId( presentation::ClickAction eCA ) ...@@ -906,7 +900,7 @@ sal_uInt16 SdTPAction::GetClickActionSdResId( presentation::ClickAction eCA )
case presentation::ClickAction_SOUND: return STR_CLICK_ACTION_SOUND; case presentation::ClickAction_SOUND: return STR_CLICK_ACTION_SOUND;
case presentation::ClickAction_VERB: return STR_CLICK_ACTION_VERB; case presentation::ClickAction_VERB: return STR_CLICK_ACTION_VERB;
case presentation::ClickAction_STOPPRESENTATION: return STR_CLICK_ACTION_STOPPRESENTATION; case presentation::ClickAction_STOPPRESENTATION: return STR_CLICK_ACTION_STOPPRESENTATION;
default: OSL_FAIL( "Keine StringResource fuer ClickAction vorhanden!" ); default: OSL_FAIL( "No StringResource for ClickAction available!" );
} }
return( 0 ); return( 0 );
} }
......
...@@ -66,8 +66,8 @@ TabPage TP_ANIMATION ...@@ -66,8 +66,8 @@ TabPage TP_ANIMATION
Hide = TRUE ; Hide = TRUE ;
}; };
// Es ist schon wichtig, da Durchsuchen (search) und Suchen (seek/find) unter- // It is important that "search" and "seek/find" are clearly
// schiedlich heissen, da sie eben auch eine unterschiedliche Bedeutung haben // distinguishable since they have different meanings
PushButton BTN_SEARCH PushButton BTN_SEARCH
{ {
HelpID = "sd:PushButton:TP_ANIMATION:BTN_SEARCH"; HelpID = "sd:PushButton:TP_ANIMATION:BTN_SEARCH";
......
...@@ -99,8 +99,8 @@ sal_Bool SdTpOptionsSnap::FillItemSet( SfxItemSet& rAttrs ) ...@@ -99,8 +99,8 @@ sal_Bool SdTpOptionsSnap::FillItemSet( SfxItemSet& rAttrs )
if( pOptsItem == NULL || !(aOptsItem == *pOptsItem) ) if( pOptsItem == NULL || !(aOptsItem == *pOptsItem) )
rAttrs.Put( aOptsItem ); rAttrs.Put( aOptsItem );
// Evtl. vorhandenes GridItem wird geholt, um nicht versehentlich // we get a possible existing GridItem, this ensures that we do net set
// irgendwelche Standardwerte einzustellen // some default values by accident
return( sal_True ); return( sal_True );
} }
...@@ -137,7 +137,7 @@ SfxTabPage* SdTpOptionsSnap::Create( Window* pWindow, ...@@ -137,7 +137,7 @@ SfxTabPage* SdTpOptionsSnap::Create( Window* pWindow,
/************************************************************************* /*************************************************************************
|* |*
|* TabPage zum Einstellen der Inhalte-Optionen |* TabPage to adjust the content options
|* |*
\************************************************************************/ \************************************************************************/
...@@ -213,7 +213,7 @@ SfxTabPage* SdTpOptionsContents::Create( Window* pWindow, ...@@ -213,7 +213,7 @@ SfxTabPage* SdTpOptionsContents::Create( Window* pWindow,
/************************************************************************* /*************************************************************************
|* |*
|* TabPage zum Einstellen der Sonstige-Optionen |* TabPage to adjust the misc options
|* |*
\************************************************************************/ \************************************************************************/
#define TABLE_COUNT 12 #define TABLE_COUNT 12
...@@ -225,7 +225,7 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs ) ...@@ -225,7 +225,7 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs )
aCbxQuickEdit ( this, SdResId( CBX_QUICKEDIT ) ), aCbxQuickEdit ( this, SdResId( CBX_QUICKEDIT ) ),
aCbxPickThrough ( this, SdResId( CBX_PICKTHROUGH ) ), aCbxPickThrough ( this, SdResId( CBX_PICKTHROUGH ) ),
// Template & Layout laufen z.Z. synchron! // At the moment, template & layout are not running synchronized
aGrpProgramStart ( this, SdResId( GRP_PROGRAMSTART ) ), aGrpProgramStart ( this, SdResId( GRP_PROGRAMSTART ) ),
aCbxStartWithTemplate ( this, SdResId( CBX_START_WITH_TEMPLATE ) ), aCbxStartWithTemplate ( this, SdResId( CBX_START_WITH_TEMPLATE ) ),
...@@ -263,7 +263,7 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs ) ...@@ -263,7 +263,7 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs )
FreeResource(); FreeResource();
SetExchangeSupport(); SetExchangeSupport();
// Metrik einstellen // set metric
FieldUnit eFUnit; FieldUnit eFUnit;
sal_uInt16 nWhich = GetWhich( SID_ATTR_METRIC ); sal_uInt16 nWhich = GetWhich( SID_ATTR_METRIC );
...@@ -277,7 +277,7 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs ) ...@@ -277,7 +277,7 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs )
SetFieldUnit( aMtrFldTabstop, eFUnit ); SetFieldUnit( aMtrFldTabstop, eFUnit );
// ListBox mit Metriken f"ullen // fill ListBox with metrics
SvxStringArray aMetricArr( RID_SVXSTR_FIELDUNIT_TABLE ); SvxStringArray aMetricArr( RID_SVXSTR_FIELDUNIT_TABLE );
sal_uInt16 i; sal_uInt16 i;
...@@ -297,7 +297,7 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs ) ...@@ -297,7 +297,7 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs )
aMtrFldOriginalHeight.SetLast( 999999999 ); aMtrFldOriginalHeight.SetLast( 999999999 );
aMtrFldOriginalHeight.SetMax( 999999999 ); aMtrFldOriginalHeight.SetMax( 999999999 );
// Temporaere Fields fuer Info-Texte (fuer Formatierung/Berechnung) // temporary fields for info texts (for formatting/calculation)
aMtrFldInfo1.SetUnit( eFUnit ); aMtrFldInfo1.SetUnit( eFUnit );
aMtrFldInfo1.SetMax( 999999999 ); aMtrFldInfo1.SetMax( 999999999 );
aMtrFldInfo1.SetDecimalDigits( 2 ); aMtrFldInfo1.SetDecimalDigits( 2 );
...@@ -305,9 +305,9 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs ) ...@@ -305,9 +305,9 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs )
aMtrFldInfo2.SetMax( 999999999 ); aMtrFldInfo2.SetMax( 999999999 );
aMtrFldInfo2.SetDecimalDigits( 2 ); aMtrFldInfo2.SetDecimalDigits( 2 );
// PoolUnit ermitteln // determine PoolUnit
SfxItemPool* pPool = rInAttrs.GetPool(); SfxItemPool* pPool = rInAttrs.GetPool();
DBG_ASSERT( pPool, "Wo ist der Pool?" ); DBG_ASSERT( pPool, "Where is the Pool?" );
ePoolUnit = pPool->GetMetric( SID_ATTR_FILL_HATCH ); ePoolUnit = pPool->GetMetric( SID_ATTR_FILL_HATCH );
// Fuellen der CB // Fuellen der CB
...@@ -328,11 +328,11 @@ SdTpOptionsMisc::~SdTpOptionsMisc() ...@@ -328,11 +328,11 @@ SdTpOptionsMisc::~SdTpOptionsMisc()
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet ) void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet )
{ {
// Hier muss noch einmal SaveValue gerufen werden, da sonst u.U. // We have to call SaveValue again since it can happen that the value
// der Wert in anderen TabPages keine Wirkung hat // has no effect on other TabPages
aLbMetric.SaveValue(); aLbMetric.SaveValue();
// Metrik ggfs. aendern (da TabPage im Dialog liegt, // change metric if necessary (since TabPage is in the Dialog where
// wo die Metrik eingestellt werden kann // the metric is set)
const SfxPoolItem* pAttr = NULL; const SfxPoolItem* pAttr = NULL;
if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC , sal_False, if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC , sal_False,
(const SfxPoolItem**)&pAttr )) (const SfxPoolItem**)&pAttr ))
...@@ -343,7 +343,7 @@ void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet ) ...@@ -343,7 +343,7 @@ void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet )
if( eFUnit != aMtrFldOriginalWidth.GetUnit() ) if( eFUnit != aMtrFldOriginalWidth.GetUnit() )
{ {
// Metriken einstellen // set metrics
sal_Int64 nVal = aMtrFldOriginalWidth.Denormalize( aMtrFldOriginalWidth.GetValue( FUNIT_TWIP ) ); sal_Int64 nVal = aMtrFldOriginalWidth.Denormalize( aMtrFldOriginalWidth.GetValue( FUNIT_TWIP ) );
SetFieldUnit( aMtrFldOriginalWidth, eFUnit, sal_True ); SetFieldUnit( aMtrFldOriginalWidth, eFUnit, sal_True );
aMtrFldOriginalWidth.SetValue( aMtrFldOriginalWidth.Normalize( nVal ), FUNIT_TWIP ); aMtrFldOriginalWidth.SetValue( aMtrFldOriginalWidth.Normalize( nVal ), FUNIT_TWIP );
...@@ -374,7 +374,7 @@ void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet ) ...@@ -374,7 +374,7 @@ void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet )
int SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet ) int SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet )
{ {
// Parsercheck // check parser
sal_Int32 nX, nY; sal_Int32 nX, nY;
if( SetScale( aCbScale.GetText(), nX, nY ) ) if( SetScale( aCbScale.GetText(), nX, nY ) )
{ {
...@@ -433,7 +433,7 @@ sal_Bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) ...@@ -433,7 +433,7 @@ sal_Bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs )
bModified = sal_True; bModified = sal_True;
} }
// Metrik // metric
const sal_uInt16 nMPos = aLbMetric.GetSelectEntryPos(); const sal_uInt16 nMPos = aLbMetric.GetSelectEntryPos();
if ( nMPos != aLbMetric.GetSavedValue() ) if ( nMPos != aLbMetric.GetSavedValue() )
{ {
...@@ -443,7 +443,7 @@ sal_Bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) ...@@ -443,7 +443,7 @@ sal_Bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs )
bModified |= sal_True; bModified |= sal_True;
} }
// Tabulatorabstand // tabulator space
if( aMtrFldTabstop.GetText() != aMtrFldTabstop.GetSavedValue() ) if( aMtrFldTabstop.GetText() != aMtrFldTabstop.GetSavedValue() )
{ {
sal_uInt16 nWh = GetWhich( SID_ATTR_DEFTABSTOP ); sal_uInt16 nWh = GetWhich( SID_ATTR_DEFTABSTOP );
...@@ -495,7 +495,7 @@ void SdTpOptionsMisc::Reset( const SfxItemSet& rAttrs ) ...@@ -495,7 +495,7 @@ void SdTpOptionsMisc::Reset( const SfxItemSet& rAttrs )
aCbxCompatibility.SaveValue(); aCbxCompatibility.SaveValue();
aCbxUsePrinterMetrics.SaveValue(); aCbxUsePrinterMetrics.SaveValue();
// Metrik // metric
sal_uInt16 nWhich = GetWhich( SID_ATTR_METRIC ); sal_uInt16 nWhich = GetWhich( SID_ATTR_METRIC );
aLbMetric.SetNoSelection(); aLbMetric.SetNoSelection();
...@@ -514,7 +514,7 @@ void SdTpOptionsMisc::Reset( const SfxItemSet& rAttrs ) ...@@ -514,7 +514,7 @@ void SdTpOptionsMisc::Reset( const SfxItemSet& rAttrs )
} }
} }
// Tabulatorabstand // tabulator space
nWhich = GetWhich( SID_ATTR_DEFTABSTOP ); nWhich = GetWhich( SID_ATTR_DEFTABSTOP );
if( rAttrs.GetItemState( nWhich ) >= SFX_ITEM_AVAILABLE ) if( rAttrs.GetItemState( nWhich ) >= SFX_ITEM_AVAILABLE )
{ {
...@@ -539,9 +539,9 @@ void SdTpOptionsMisc::Reset( const SfxItemSet& rAttrs ) ...@@ -539,9 +539,9 @@ void SdTpOptionsMisc::Reset( const SfxItemSet& rAttrs )
aFtOriginal.Hide(); aFtOriginal.Hide();
aFtEquivalent.Hide(); aFtEquivalent.Hide();
aMtrFldOriginalWidth.Hide(); aMtrFldOriginalWidth.Hide();
aMtrFldOriginalWidth.SetText( aInfo1 ); // leer aMtrFldOriginalWidth.SetText( aInfo1 ); // empty
aMtrFldOriginalHeight.Hide(); aMtrFldOriginalHeight.Hide();
aMtrFldOriginalHeight.SetText( aInfo2 ); //leer aMtrFldOriginalHeight.SetText( aInfo2 ); //empty
aFtPageWidth.Hide(); aFtPageWidth.Hide();
aFtPageHeight.Hide(); aFtPageHeight.Hide();
aFiInfo1.Hide(); aFiInfo1.Hide();
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#define SCALE_TEXT \ #define SCALE_TEXT \
Text [ en-US ] = "Scale" ; \ Text [ en-US ] = "Scale" ; \
// Contents (Inhalte) // Contents
TabPage TP_OPTIONS_CONTENTS TabPage TP_OPTIONS_CONTENTS
{ {
HelpID = HID_SD_OPTIONS_CONTENTS ; HelpID = HID_SD_OPTIONS_CONTENTS ;
...@@ -70,7 +70,7 @@ TabPage TP_OPTIONS_CONTENTS ...@@ -70,7 +70,7 @@ TabPage TP_OPTIONS_CONTENTS
Text [ en-US ] = "~Contour of each individual object" ; Text [ en-US ] = "~Contour of each individual object" ;
}; };
}; };
// MISC (Sonstiges) // MISC
TabPage TP_OPTIONS_MISC TabPage TP_OPTIONS_MISC
{ {
HelpID = HID_SD_OPTIONS_MISC ; HelpID = HID_SD_OPTIONS_MISC ;
......
...@@ -35,23 +35,16 @@ ...@@ -35,23 +35,16 @@
TYPEINIT1(StyleSheetUndoAction, SdUndoAction); TYPEINIT1(StyleSheetUndoAction, SdUndoAction);
/*************************************************************************
|*
|* Konstruktor
|*
\************************************************************************/
StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc, StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc,
SfxStyleSheet* pTheStyleSheet, SfxStyleSheet* pTheStyleSheet,
const SfxItemSet* pTheNewItemSet) : const SfxItemSet* pTheNewItemSet) :
SdUndoAction(pTheDoc) SdUndoAction(pTheDoc)
{ {
DBG_ASSERT(pTheStyleSheet, "Undo ohne StyleSheet ???"); DBG_ASSERT(pTheStyleSheet, "Undo without StyleSheet ???");
pStyleSheet = pTheStyleSheet; pStyleSheet = pTheStyleSheet;
// ItemSets anlegen; Vorsicht, das neue koennte aus einem anderen Pool // Create ItemSets; Attention, it is possible that the new one is from a,
// stammen, also mitsamt seinen Items clonen // different pool. Therefore we clone it with its items.
pNewSet = new SfxItemSet((SfxItemPool&)SdrObject::GetGlobalDrawObjectItemPool(), pTheNewItemSet->GetRanges()); pNewSet = new SfxItemSet((SfxItemPool&)SdrObject::GetGlobalDrawObjectItemPool(), pTheNewItemSet->GetRanges());
pTheDoc->MigrateItemSet( pTheNewItemSet, pNewSet, pTheDoc ); pTheDoc->MigrateItemSet( pTheNewItemSet, pNewSet, pTheDoc );
...@@ -61,7 +54,7 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc, ...@@ -61,7 +54,7 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc,
aComment = String(SdResId(STR_UNDO_CHANGE_PRES_OBJECT)); aComment = String(SdResId(STR_UNDO_CHANGE_PRES_OBJECT));
String aName(pStyleSheet->GetName()); String aName(pStyleSheet->GetName());
// Layoutnamen und Separator loeschen // delete layout name and separator
String aSep( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ) ); String aSep( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ) );
sal_uInt16 nPos = aName.Search(aSep); sal_uInt16 nPos = aName.Search(aSep);
if( nPos != STRING_NOTFOUND ) if( nPos != STRING_NOTFOUND )
...@@ -99,19 +92,13 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc, ...@@ -99,19 +92,13 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc,
} }
} }
// Platzhalter durch Vorlagennamen ersetzen // replace placeholder with template name
nPos = aComment.Search(sal_Unicode('$')); nPos = aComment.Search(sal_Unicode('$'));
aComment.Erase(nPos, 1); aComment.Erase(nPos, 1);
aComment.Insert(aName, nPos); aComment.Insert(aName, nPos);
} }
/*************************************************************************
|*
|* Undo()
|*
\************************************************************************/
void StyleSheetUndoAction::Undo() void StyleSheetUndoAction::Undo()
{ {
SfxItemSet aNewSet( mpDoc->GetItemPool(), pOldSet->GetRanges() ); SfxItemSet aNewSet( mpDoc->GetItemPool(), pOldSet->GetRanges() );
...@@ -124,11 +111,6 @@ void StyleSheetUndoAction::Undo() ...@@ -124,11 +111,6 @@ void StyleSheetUndoAction::Undo()
pStyleSheet->Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED)); pStyleSheet->Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED));
} }
/*************************************************************************
|*
|* Redo()
|*
\************************************************************************/
void StyleSheetUndoAction::Redo() void StyleSheetUndoAction::Redo()
{ {
...@@ -142,11 +124,6 @@ void StyleSheetUndoAction::Redo() ...@@ -142,11 +124,6 @@ void StyleSheetUndoAction::Redo()
pStyleSheet->Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED)); pStyleSheet->Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED));
} }
/*************************************************************************
|*
|* Destruktor
|*
\************************************************************************/
StyleSheetUndoAction::~StyleSheetUndoAction() StyleSheetUndoAction::~StyleSheetUndoAction()
{ {
...@@ -154,11 +131,6 @@ StyleSheetUndoAction::~StyleSheetUndoAction() ...@@ -154,11 +131,6 @@ StyleSheetUndoAction::~StyleSheetUndoAction()
delete pOldSet; delete pOldSet;
} }
/*************************************************************************
|*
|* Kommentar liefern
|*
\************************************************************************/
rtl::OUString StyleSheetUndoAction::GetComment() const rtl::OUString StyleSheetUndoAction::GetComment() const
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment