summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMatthias Freund <matti_lx@yahoo.de>2013-04-01 00:20:42 +0200
committerThomas Arnhold <thomas@arnhold.org>2013-04-01 08:29:40 +0000
commit3ff0c75ef6d8101cd1505aa245429f33789c6d6b (patch)
tree7b6dfcba7757fc3a212109a269740d96c80f90d1 /sw
parent9b6b7e82a831b08617a767ff934040976c570994 (diff)
Comment translation GER-ENG in sw/source/ui/utlui/ (Part 3)
Change-Id: I33a96565553a78e30f4d6af0b4b92371188d053e Reviewed-on: https://gerrit.libreoffice.org/3144 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/utlui/navipi.cxx116
-rw-r--r--sw/source/ui/utlui/prcntfld.cxx24
-rw-r--r--sw/source/ui/utlui/shdwcrsr.cxx16
-rw-r--r--sw/source/ui/utlui/tmplctrl.cxx11
-rw-r--r--sw/source/ui/utlui/uiitems.cxx26
-rw-r--r--sw/source/ui/utlui/viewlayoutctrl.cxx6
-rw-r--r--sw/source/ui/utlui/zoomctrl.cxx3
7 files changed, 63 insertions, 139 deletions
diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx
index 5b11717461ca..89a53b8e0530 100644
--- a/sw/source/ui/utlui/navipi.cxx
+++ b/sw/source/ui/utlui/navipi.cxx
@@ -30,7 +30,7 @@
#include <sfx2/dispatch.hxx>
#include <sfx2/dockwin.hxx>
#include <vcl/toolbox.hxx>
-#include <swtypes.hxx> // fuer Pathfinder
+#include <swtypes.hxx> // for pathfinder
#include <swmodule.hxx>
#include <view.hxx>
#include <navicfg.hxx>
@@ -54,16 +54,14 @@
#include <unomid.h>
-#define PAGE_CHANGE_TIMEOUT 1000 //Timeout fuer Seitenwechsel
+#define PAGE_CHANGE_TIMEOUT 1000
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::frame;
SFX_IMPL_CHILDWINDOW_CONTEXT( SwNavigationChild, SID_NAVIGATOR, SwView )
-/*------------------------------------------------------------------------
- Bechreibung: Steuerzeichen aus dem Outline-Entry filtern
-------------------------------------------------------------------------*/
+// Filter the control characters out of the Outline-Entry
void SwNavigationPI::CleanEntry( String& rEntry )
{
@@ -73,10 +71,8 @@ void SwNavigationPI::CleanEntry( String& rEntry )
if( *pStr == 10 || *pStr == 9 )
*pStr = 0x20;
}
-/*------------------------------------------------------------------------
- Beschreibung: Ausfuehrung der Drag-Operation
- mit und ohne Children
-------------------------------------------------------------------------*/
+
+// Execution of the drag operation with and without the children.
void SwNavigationPI::MoveOutline(sal_uInt16 nSource, sal_uInt16 nTarget,
bool bWithChildren)
@@ -92,7 +88,7 @@ void SwNavigationPI::MoveOutline(sal_uInt16 nSource, sal_uInt16 nTarget,
rSh.GotoOutline(nSource);
if (bWithChildren)
rSh.MakeOutlineSel(nSource, nSource, sal_True);
- // Die selektierten Children zaehlen bei der Bewegung vorwaerts nicht mit
+ // While moving, the selected children does not counting.
sal_uInt16 nLastOutlinePos = rSh.GetOutlinePos(MAXLEVEL);
if(bWithChildren && nMove > 1 &&
nLastOutlinePos < nTarget)
@@ -110,11 +106,7 @@ void SwNavigationPI::MoveOutline(sal_uInt16 nSource, sal_uInt16 nTarget,
}
-
-/*------------------------------------------------------------------------
- Beschreibung: Nach Goto einen Status Rahmenselektion aufheben
-------------------------------------------------------------------------*/
-
+// After goto cancel the status frame selection
static void lcl_UnSelectFrm(SwWrtShell *pSh)
{
@@ -125,10 +117,7 @@ static void lcl_UnSelectFrm(SwWrtShell *pSh)
}
}
-/*------------------------------------------------------------------------
- Beschreibung: Select der Documentanzeige
-------------------------------------------------------------------------*/
-
+// Select the document view
IMPL_LINK( SwNavigationPI, DocListBoxSelectHdl, ListBox *, pBox )
{
@@ -154,11 +143,8 @@ IMPL_LINK( SwNavigationPI, DocListBoxSelectHdl, ListBox *, pBox )
return 0;
}
-/*------------------------------------------------------------------------
- Beschreibung: Fuellen der ListBox fuer Outline Sicht oder Dokumente
- Der PI wird auf volle Groesse gesetzt
-------------------------------------------------------------------------*/
-
+// Filling of the list box for outline view or documents
+// The PI will be set to full size
void SwNavigationPI::FillBox()
{
@@ -185,7 +171,6 @@ void SwNavigationPI::FillBox()
}
}
-
void SwNavigationPI::UsePage(SwWrtShell *pSh)
{
if (!pSh)
@@ -206,10 +191,7 @@ void SwNavigationPI::UsePage(SwWrtShell *pSh)
}
}
-/*------------------------------------------------------------------------
- Beschreibung: SelectHandler der Toolboxen
-------------------------------------------------------------------------*/
-
+// Select handler of the toolboxes
IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox )
{
@@ -218,10 +200,10 @@ IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox )
if (!pView)
return 1;
SwWrtShell &rSh = pView->GetWrtShell();
- //MouseModifier fuer Outline-Move besorgen
+ // Get MouseModifier for Outline-Move
- //Standard: Unterebenen werden mitgenommen
- // mit Ctrl Unterebenen nicht mitnehmen
+ // Standard: sublevels are taken
+ // do not take sublevels with Ctrl
sal_Bool bOutlineWithChildren = ( KEY_MOD1 != pBox->GetModifier());
int nFuncId = 0;
bool bFocusToDoc = false;
@@ -254,8 +236,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox )
}
}
return sal_True;
- // Funktionen, die eine direkte Aktion ausloesen
-
+ // Functions that will trigger a direct action.
case FN_SELECT_FOOTER:
{
rSh.MoveCrsr();
@@ -288,15 +269,15 @@ IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox )
{
rSh.MoveCrsr();
const sal_uInt16 eFrmType = rSh.GetFrmType(0,sal_False);
- // aus Fussnote zum Anker springen
+ // Jump from the footnote to the anchor.
if (eFrmType & FRMTYPE_FOOTNOTE)
{
if (rSh.GotoFtnAnchor())
nFuncId = FN_FOOTNOTE_TO_ANCHOR;
}
- // andernfalls zuerst zum Fussnotentext springen; geht
- // dies nicht, zur naechten Fussnote; geht auch dies
- // nicht, zur vorhergehenden Fussnote
+ // Otherwise, jump to the first footnote text;
+ // go to the next footnote if this is not possible;
+ // if this is also not possible got to the footnote before.
else
{
if (rSh.GotoFtnTxt())
@@ -339,7 +320,6 @@ IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox )
}
break;
}
-
if (nFuncId)
{
lcl_UnSelectFrm(&rSh);
@@ -348,10 +328,8 @@ IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox )
pView->GetEditWin().GrabFocus();
return sal_True;
}
-/*------------------------------------------------------------------------
- Beschreibung: ClickHandler der Toolboxen
-------------------------------------------------------------------------*/
+// Click handler of the toolboxes
IMPL_LINK( SwNavigationPI, ToolBoxClickHdl, ToolBox *, pBox )
{
@@ -430,7 +408,6 @@ IMPL_LINK( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox )
return sal_True;
}
-
SwNavHelpToolBox::SwNavHelpToolBox(SwNavigationPI* pParent, const ResId &rResId) :
SwHelpToolBox(pParent, rResId)
{}
@@ -476,11 +453,8 @@ void SwNavHelpToolBox::RequestHelp( const HelpEvent& rHEvt )
SwHelpToolBox::RequestHelp(rHEvt);
}
-/*------------------------------------------------------------------------
- Beschreibung: Action-Handler Edit; wechselt auf die Seite, wenn
- nicht Gliederungssicht angeschaltet ist.
-------------------------------------------------------------------------*/
-
+// Action-Handler Edit:
+// Switches to the page if the structure view is not turned on.
IMPL_LINK( SwNavigationPI, EditAction, NumEditAction *, pEdit )
{
@@ -496,11 +470,7 @@ IMPL_LINK( SwNavigationPI, EditAction, NumEditAction *, pEdit )
return 0;
}
-/*------------------------------------------------------------------------
- Beschreibung: Falls die Seite eingestellt werden kann, wird hier
- das Maximum gesetzt.
-------------------------------------------------------------------------*/
-
+// If the page can be set here, the maximum is set.
IMPL_LINK( SwNavigationPI, EditGetFocus, NumEditAction *, pEdit )
{
@@ -523,10 +493,7 @@ sal_Bool SwNavigationPI::Close()
return sal_True;
}
-/*------------------------------------------------------------------------
- Beschreibung: Setzen einer automatischen Marke
-------------------------------------------------------------------------*/
-
+// Setting of an automatic mark
void SwNavigationPI::MakeMark()
{
@@ -591,7 +558,7 @@ void SwNavigationPI::_ZoomOut()
}
SvTreeListEntry* pFirst = aContentTree.FirstSelected();
if(pFirst)
- aContentTree.Select(pFirst, sal_True); // toolbox enablen
+ aContentTree.Select(pFirst, sal_True); // Enable toolbox
pConfig->SetSmall( sal_False );
aContentToolBox.CheckItem(FN_SHOW_CONTENT_BOX);
}
@@ -618,7 +585,7 @@ void SwNavigationPI::_ZoomIn()
pFloat->SetOutputSizePixel(aSz);
SvTreeListEntry* pFirst = aContentTree.FirstSelected();
if(pFirst)
- aContentTree.Select(pFirst, sal_True); // toolbox enablen
+ aContentTree.Select(pFirst, sal_True); // Enable toolbox
pConfig->SetSmall( sal_True );
aContentToolBox.CheckItem(FN_SHOW_CONTENT_BOX, sal_False);
}
@@ -662,7 +629,7 @@ void SwNavigationPI::Resize()
else
aDocLBSz.Height() = nDocLBIniHeight;
aContentTree.SetSizePixel(aNewSize);
- // GlobalTree faengt weiter oben an und reicht bis ganz unten
+ // GlobalTree starts on to the top and goes all the way down.
aNewSize.Height() += (nDist + nDocLBIniHeight + aPos.Y() - aGlobalTree.GetPosPixel().Y());
aGlobalTree.SetSizePixel(aNewSize);
aDocListBox.setPosSizePixel( aLBPos.X(), aLBPos.Y(),
@@ -718,7 +685,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
nDocLBIniHeight = aDocListBox.GetSizePixel().Height();
nZoomOutInit = nZoomOut = Resource::ReadShortRes();
- //NumericField in die Toolbox einfuegen
+ // Insert the numeric field in the toolbox.
NumEditAction* pEdit = new NumEditAction(
&aContentToolBox, SW_RES(NF_PAGE ));
pEdit->SetActionHdl(LINK(this, SwNavigationPI, EditAction));
@@ -729,8 +696,8 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
bPageCtrlsVisible = sal_True;
- //doppelte Separatoren sind nicht erlaubt, also muss
- //die passende Groesse anders ermittelt werden
+ // Double separators are not allowed, so you have to
+ // determine the suitable size differently.
Rectangle aFirstRect = aContentToolBox.GetItemRect(FN_SELECT_FOOTNOTE);
Rectangle aSecondRect = aContentToolBox.GetItemRect(FN_SELECT_HEADER);
sal_uInt16 nWidth = sal_uInt16(aFirstRect.Left() - aSecondRect.Left());
@@ -763,7 +730,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
// position listbox below toolbar and add some space
long nListboxYPos = aContentToolBox.GetPosPixel().Y() + aContentToolboxSize.Height() + 4;
- //Der linke und rechte Rand um die Toolboxen soll gleich sein
+ // The left and right margins around the toolboxes should be equal.
nWishWidth = aContentToolboxSize.Width();
nWishWidth += 2 * aContentToolBox.GetPosPixel().X();
@@ -795,7 +762,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
aContentTree.ShowTree();
aContentToolBox.CheckItem(FN_SHOW_CONTENT_BOX, sal_True);
-// TreeListBox fuer Globaldokument
+// TreeListBox for global document
aGlobalTree.setPosSizePixel( 0, nListboxYPos, 0, 0, WINDOW_POSSIZE_Y );
aGlobalTree.SetSelectionMode( MULTIPLE_SELECTION );
aGlobalTree.SetStyle( aGlobalTree.GetStyle()|WB_HASBUTTONS|WB_HASBUTTONSATROOT|
@@ -952,9 +919,7 @@ void SwNavigationPI::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/,
}
}
-/*------------------------------------------------------------------------
- Bechreibung: NumericField aus der Toolbox holen
-------------------------------------------------------------------------*/
+// Get the numeric field from the toolbox.
NumEditAction& SwNavigationPI::GetPageEdit()
{
@@ -1000,9 +965,7 @@ SfxChildAlignment eRetAlign;
}
-/*--------------------------------------------------------------------
- Beschreibung: Benachrichtigung bei geaenderter DocInfo
- --------------------------------------------------------------------*/
+// Notification on modified DocInfo
void SwNavigationPI::Notify( SfxBroadcaster& rBrdc, const SfxHint& rHint )
{
@@ -1035,8 +998,8 @@ void SwNavigationPI::Notify( SfxBroadcaster& rBrdc, const SfxHint& rHint )
if(aGlobalTree.Update( sal_False ))
aGlobalTree.Display();
else
- // wenn kein Update notwendig, dann zumindest painten
- // wg. der roten Eintraege fuer broken links
+ // If no update is needed, then paint at least,
+ // because of the red entries for the broken links.
aGlobalTree.Invalidate();
}
}
@@ -1098,7 +1061,7 @@ void SwNavigationPI::UpdateListBox()
}
pView = SwModule::GetNextView(pView);
}
- aDocListBox.InsertEntry(aStatusArr[3]); //"Aktives Fenster"
+ aDocListBox.InsertEntry(aStatusArr[3]); // "Active Window"
nCount++;
if(aContentTree.GetHiddenWrtShell())
@@ -1113,7 +1076,7 @@ void SwNavigationPI::UpdateListBox()
}
if(aContentTree.IsActiveView())
{
- //entweder den Namen des akt. Docs oder "Aktives Dokument"
+ //Either the name of the current Document or "Active Document".
sal_uInt16 nTmp = pActView ? nAct : --nCount;
aDocListBox.SelectEntryPos( nTmp );
}
@@ -1207,7 +1170,7 @@ sal_Int8 SwNavigationPI::ExecuteDrop( const ExecuteDropEvent& rEvt )
{
INetURLObject aTemp( sFileName );
GraphicDescriptor aDesc( aTemp );
- if( !aDesc.Detect() ) // keine Grafiken annehmen
+ if( !aDesc.Detect() ) // accept no graphics
{
if( STRING_NOTFOUND == sFileName.Search('#')
&& (!sContentFileName.Len() || sContentFileName != sFileName ))
@@ -1250,7 +1213,6 @@ void SwNavigationPI::SetRegionDropMode(sal_uInt16 nNewMode)
aContentToolBox.SetItemImage( FN_DROP_REGION, rImgLst.GetImage(nDropId));
}
-
sal_Bool SwNavigationPI::ToggleTree()
{
sal_Bool bRet = sal_True;
diff --git a/sw/source/ui/utlui/prcntfld.cxx b/sw/source/ui/utlui/prcntfld.cxx
index 0c682f88c9a1..12d869dcb254 100644
--- a/sw/source/ui/utlui/prcntfld.cxx
+++ b/sw/source/ui/utlui/prcntfld.cxx
@@ -220,7 +220,7 @@ void PercentField::SetPrcntValue(sal_Int64 nNewValue, FieldUnit eInUnit)
else
{
- // Ausgangswert ueberschreiben, nicht spaeter restaurieren
+ // Overwrite output value, do not restore later
sal_Int64 nPercent, nAktWidth;
if(eInUnit == FUNIT_TWIP)
{
@@ -242,7 +242,7 @@ void PercentFieldWrap::SetPrcntValue(sal_Int64 nNewValue, FieldUnit eInUnit)
m_pField->SetValue(Convert(nNewValue, eInUnit, m_pField->GetUnit()));
else
{
- // Ausgangswert ueberschreiben, nicht spaeter restaurieren
+ // Overwrite output value, do not restore later
sal_Int64 nPercent, nAktWidth;
if(eInUnit == FUNIT_TWIP)
{
@@ -265,7 +265,7 @@ void PercentField::SetUserValue( sal_Int64 nNewValue, FieldUnit eInUnit )
else
{
- // Ausgangswert ueberschreiben, nicht spaeter restaurieren
+ // Overwrite output value, do not restore later
sal_Int64 nPercent, nAktWidth;
if(eInUnit == FUNIT_TWIP)
{
@@ -450,10 +450,10 @@ sal_Int64 PercentField::Convert(sal_Int64 nValue, FieldUnit eInUnit, FieldUnit e
if (eInUnit == FUNIT_CUSTOM)
{
- // Umrechnen in Metrik
+ // Convert to metric
sal_Int64 nTwipValue = (nRefValue * nValue + 50) / 100;
- if (eOutUnit == FUNIT_TWIP) // Nur wandeln, wenn unbedingt notwendig
+ if (eOutUnit == FUNIT_TWIP) // Only convert if necessary
return NormalizePercent(nTwipValue);
else
return ConvertValue(NormalizePercent(nTwipValue), 0, nOldDigits, FUNIT_TWIP, eOutUnit);
@@ -461,11 +461,11 @@ sal_Int64 PercentField::Convert(sal_Int64 nValue, FieldUnit eInUnit, FieldUnit e
if (eOutUnit == FUNIT_CUSTOM)
{
- // Umrechnen in Prozent
+ // Convert to percent
sal_Int64 nAktWidth;
nValue = DenormalizePercent(nValue);
- if (eInUnit == FUNIT_TWIP) // Nur wandeln, wenn unbedingt notwendig
+ if (eInUnit == FUNIT_TWIP) // Only convert if necessary
nAktWidth = nValue;
else
nAktWidth = ConvertValue(nValue, 0, nOldDigits, eInUnit, FUNIT_TWIP);
@@ -485,10 +485,10 @@ sal_Int64 PercentFieldWrap::Convert(sal_Int64 nValue, FieldUnit eInUnit, FieldUn
if (eInUnit == FUNIT_CUSTOM)
{
- // Umrechnen in Metrik
+ // Convert to metric
sal_Int64 nTwipValue = (nRefValue * nValue + 50) / 100;
- if (eOutUnit == FUNIT_TWIP) // Nur wandeln, wenn unbedingt notwendig
+ if (eOutUnit == FUNIT_TWIP) // Only convert if necessary
return NormalizePercent(nTwipValue);
else
return m_pField->ConvertValue(NormalizePercent(nTwipValue), 0, nOldDigits, FUNIT_TWIP, eOutUnit);
@@ -496,11 +496,11 @@ sal_Int64 PercentFieldWrap::Convert(sal_Int64 nValue, FieldUnit eInUnit, FieldUn
if (eOutUnit == FUNIT_CUSTOM)
{
- // Umrechnen in Prozent
+ // Convert to percent
sal_Int64 nAktWidth;
nValue = DenormalizePercent(nValue);
- if (eInUnit == FUNIT_TWIP) // Nur wandeln, wenn unbedingt notwendig
+ if (eInUnit == FUNIT_TWIP) // Only convert if necessary
nAktWidth = nValue;
else
nAktWidth = m_pField->ConvertValue(nValue, 0, nOldDigits, eInUnit, FUNIT_TWIP);
@@ -511,6 +511,4 @@ sal_Int64 PercentFieldWrap::Convert(sal_Int64 nValue, FieldUnit eInUnit, FieldUn
return m_pField->ConvertValue(nValue, 0, nOldDigits, eInUnit, eOutUnit);
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/utlui/shdwcrsr.cxx b/sw/source/ui/utlui/shdwcrsr.cxx
index e0f1facbfe4c..6e30e2ff21f5 100644
--- a/sw/source/ui/utlui/shdwcrsr.cxx
+++ b/sw/source/ui/utlui/shdwcrsr.cxx
@@ -25,7 +25,6 @@
using namespace ::com::sun::star;
-
SwShadowCursor::~SwShadowCursor()
{
if( USHRT_MAX != nOldMode )
@@ -53,10 +52,10 @@ void SwShadowCursor::DrawTri( const Point& rPt, long nHeight, bool bLeft )
long nLineDiff = ( nHeight / 2 );
long nLineDiffHalf = nLineDiff / 2;
- // Punkt oben
+ // Dot above
Point aPt1( (bLeft ? rPt.X() - 3 : rPt.X() + 3),
rPt.Y() + nLineDiffHalf );
- // Punkt unten
+ // Dot below
Point aPt2( aPt1.X(), aPt1.Y() + nHeight - nLineDiff - 1 );
long nDiff = bLeft ? -1 : 1;
while( aPt1.Y() <= aPt2.Y() )
@@ -78,14 +77,14 @@ void SwShadowCursor::DrawCrsr( const Point& rPt, long nHeight, sal_uInt16 nMode
pWin->SetLineColor( Color( aCol.GetColor() ^ COL_WHITE ) );
- // 1. der Strich:
+ // 1. The Line:
pWin->DrawLine( Point( rPt.X(), rPt.Y() + 1),
Point( rPt.X(), rPt.Y() - 2 + nHeight ));
- // 2. das Dreieck
- if( text::HoriOrientation::LEFT == nMode || text::HoriOrientation::CENTER == nMode ) // Pfeil nach rechts
+ // 2. The Triangle
+ if( text::HoriOrientation::LEFT == nMode || text::HoriOrientation::CENTER == nMode ) // Arrow to the right
DrawTri( rPt, nHeight, false );
- if( text::HoriOrientation::RIGHT == nMode || text::HoriOrientation::CENTER == nMode ) // Pfeil nach links
+ if( text::HoriOrientation::RIGHT == nMode || text::HoriOrientation::CENTER == nMode ) // Arrow to the left
DrawTri( rPt, nHeight, true );
pWin->Pop();
@@ -118,7 +117,4 @@ Rectangle SwShadowCursor::GetRect() const
return pWin->PixelToLogic( Rectangle( aPt, aSz ) );
}
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/utlui/tmplctrl.cxx b/sw/source/ui/utlui/tmplctrl.cxx
index fba6dd705351..456faf6e7d8b 100644
--- a/sw/source/ui/utlui/tmplctrl.cxx
+++ b/sw/source/ui/utlui/tmplctrl.cxx
@@ -31,13 +31,8 @@
#include "docsh.hxx"
#include "tmplctrl.hxx"
-
-// STATIC DATA -----------------------------------------------------------
-
SFX_IMPL_STATUSBAR_CONTROL( SwTemplateControl, SfxStringItem );
-// class SwTemplatePopup_Impl --------------------------------------------------
-
class SwTemplatePopup_Impl : public PopupMenu
{
public:
@@ -62,7 +57,7 @@ void SwTemplatePopup_Impl::Select()
nCurId = GetCurItemId();
}
-// class SvxZoomStatusBarControl ------------------------------------------
+// class SvxZoomStatusBarControl
SwTemplateControl::SwTemplateControl( sal_uInt16 _nSlotId,
sal_uInt16 _nId,
@@ -125,7 +120,7 @@ void SwTemplateControl::Command( const CommandEvent& rCEvt )
sal_uInt16 nCurrId = aPop.GetCurId();
if( nCurrId != USHRT_MAX)
{
- // sieht etwas umstaendlich aus, anders geht's aber nicht
+ // looks a bit awkward, but another way is not possible
pStyle = pPool->operator[]( nCurrId - 1 );
SfxStringItem aStyle( FN_SET_PAGE_STYLE, pStyle->GetName() );
pWrtShell->GetView().GetViewFrame()->GetDispatcher()->Execute(
@@ -140,6 +135,4 @@ void SwTemplateControl::Command( const CommandEvent& rCEvt )
}
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/utlui/uiitems.cxx b/sw/source/ui/utlui/uiitems.cxx
index 9287f9af14b9..aa15e18d05b1 100644
--- a/sw/source/ui/utlui/uiitems.cxx
+++ b/sw/source/ui/utlui/uiitems.cxx
@@ -38,32 +38,27 @@ SwPageFtnInfoItem::SwPageFtnInfoItem( const sal_uInt16 nId, SwPageFtnInfo& rInfo
{
}
-
SwPageFtnInfoItem::SwPageFtnInfoItem( const SwPageFtnInfoItem& rItem ) :
SfxPoolItem( rItem ),
aFtnInfo(rItem.GetPageFtnInfo())
{
}
-
SwPageFtnInfoItem::~SwPageFtnInfoItem()
{
}
-
SfxPoolItem* SwPageFtnInfoItem::Clone( SfxItemPool * /*pPool*/ ) const
{
return new SwPageFtnInfoItem( *this );
}
-
int SwPageFtnInfoItem::operator==( const SfxPoolItem& rAttr ) const
{
- OSL_ENSURE( Which() == rAttr.Which(), "keine gleichen Attribute" );
+ OSL_ENSURE( Which() == rAttr.Which(), "no equal attributes" );
return ( aFtnInfo == ((SwPageFtnInfoItem&)rAttr).GetPageFtnInfo());
}
-
SfxItemPresentation SwPageFtnInfoItem::GetPresentation
(
SfxItemPresentation ePres,
@@ -214,20 +209,14 @@ SwPtrItem::SwPtrItem( const sal_uInt16 nId, void* pPtr ) :
{
}
-/*--------------------------------------------------------------------
- Beschreibung: Copy-Konstruktor
- --------------------------------------------------------------------*/
-
+// Copy constructor
SwPtrItem::SwPtrItem( const SwPtrItem& rItem ) : SfxPoolItem( rItem )
{
pMisc = rItem.pMisc;
}
-/*--------------------------------------------------------------------
- Beschreibung: Clonen
- --------------------------------------------------------------------*/
-
+// Cloning
SfxPoolItem* SwPtrItem::Clone( SfxItemPool * /*pPool*/ ) const
{
@@ -241,10 +230,8 @@ int SwPtrItem::operator==( const SfxPoolItem& rAttr ) const
return ( pMisc == rItem.pMisc );
}
+// SwUINumRuleItem for the NumTabPages of the FormatNumRule/Styleists
-/*--------------------------------------------------------------
- SwUINumRuleItem fuer die NumTabPages der FormatNumRule/Stylisten
----------------------------------------------------------------*/
SwUINumRuleItem::SwUINumRuleItem( const SwNumRule& rRul, const sal_uInt16 nId )
: SfxPoolItem( nId ), pRule( new SwNumRule( rRul ) )
{
@@ -261,7 +248,6 @@ SwUINumRuleItem::SwUINumRuleItem( const SwUINumRuleItem& rItem )
delete pRule;
}
-
SfxPoolItem* SwUINumRuleItem::Clone( SfxItemPool * /*pPool*/ ) const
{
return new SwUINumRuleItem( *this );
@@ -305,20 +291,17 @@ SfxPoolItem* SwBackgroundDestinationItem::Clone( SfxItemPool * /*pPool*/ ) c
return new SwBackgroundDestinationItem(Which(), GetValue());
}
-
SwPaMItem::SwPaMItem( const sal_uInt16 nId, SwPaM* pPaM ) :
SfxPoolItem( nId ),
m_pPaM(pPaM)
{
}
-
SwPaMItem::SwPaMItem( const SwPaMItem& rItem ) : SfxPoolItem( rItem )
{
m_pPaM = rItem.m_pPaM;
}
-
SfxPoolItem* SwPaMItem::Clone( SfxItemPool * /*pPool*/ ) const
{
return new SwPaMItem( *this );
@@ -331,5 +314,4 @@ int SwPaMItem::operator==( const SfxPoolItem& rAttr ) const
return ( m_pPaM == rItem.m_pPaM );
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/utlui/viewlayoutctrl.cxx b/sw/source/ui/utlui/viewlayoutctrl.cxx
index 3074f0eab5de..c785ba94f58a 100644
--- a/sw/source/ui/utlui/viewlayoutctrl.cxx
+++ b/sw/source/ui/utlui/viewlayoutctrl.cxx
@@ -24,9 +24,7 @@
#include <svl/eitem.hxx>
#include <svx/viewlayoutitem.hxx>
#include <utlui.hrc>
-#include <swtypes.hxx> // fuer Pathfinder
-
-// STATIC DATA -----------------------------------------------------------
+#include <swtypes.hxx> // for pathfinder
SFX_IMPL_STATUSBAR_CONTROL( SwViewLayoutControl, SvxViewLayoutItem );
@@ -47,8 +45,6 @@ struct SwViewLayoutControl::SwViewLayoutControl_Impl
Image maImageBookMode_Active;
};
-// class SwViewLayoutControl ------------------------------------------
-
SwViewLayoutControl::SwViewLayoutControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& rStb ) :
SfxStatusBarControl( _nSlotId, _nId, rStb ),
mpImpl( new SwViewLayoutControl_Impl )
diff --git a/sw/source/ui/utlui/zoomctrl.cxx b/sw/source/ui/utlui/zoomctrl.cxx
index 44e1e1c4c2c7..1b83b837a3d5 100644
--- a/sw/source/ui/utlui/zoomctrl.cxx
+++ b/sw/source/ui/utlui/zoomctrl.cxx
@@ -70,7 +70,4 @@ void SwZoomControl::Command( const CommandEvent& rCEvt )
SvxZoomStatusBarControl::Command(rCEvt);
}
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */