convert to new OSL family of asserts

1 files changed, 7 insertions, 12 deletions

diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx
index a6b0a161f492..68d72c129afc 100644
--- a/sw/source/ui/envelp/envprt.cxx
+++ b/sw/source/ui/envelp/envprt.cxx
@@ -65,12 +65,12 @@ SwEnvPrtPage::SwEnvPrtPage(Window* pParent, const SfxItemSet& rSet) :
     FreeResource();
     SetExchangeSupport();
 
-    // Metriken
+    // Metrics
     FieldUnit eUnit = ::GetDfltMetric(FALSE);
     SetMetric(aRightField, eUnit);
     SetMetric(aDownField , eUnit);
 
-    // Handler installieren
+    // Install handlers
     aTopButton   .SetClickHdl(LINK(this, SwEnvPrtPage, ClickHdl));
     aBottomButton.SetClickHdl(LINK(this, SwEnvPrtPage, ClickHdl));
 
@@ -82,9 +82,7 @@ SwEnvPrtPage::SwEnvPrtPage(Window* pParent, const SfxItemSet& rSet) :
     // ToolBox
     Size aSz = aAlignBox.CalcWindowSizePixel();
     aAlignBox.SetSizePixel(aSz);
-//    aAlignBox.SetPosPixel(Point(aNoNameFL.GetPosPixel().X() + (aNoNameFL.GetSizePixel().Width() - aSz.Width()) / 2, aAlignBox.GetPosPixel().Y()));
     aAlignBox.SetClickHdl(LINK(this, SwEnvPrtPage, AlignHdl));
-
 }
 
 SwEnvPrtPage::~SwEnvPrtPage()
@@ -96,7 +94,7 @@ IMPL_LINK( SwEnvPrtPage, ClickHdl, Button *, EMPTYARG )
     sal_Bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
     if (aBottomButton.IsChecked())
     {
-        // Briefumschlaege von unten
+        // Envelope from botton
         aAlignBox.SetItemImage(ITM_HOR_LEFT, Bitmap(SW_RES(bHC ? BMP_HOR_LEFT_LOWER_H : BMP_HOR_LEFT_LOWER)));
         aAlignBox.SetItemImage(ITM_HOR_CNTR, Bitmap(SW_RES(bHC ? BMP_HOR_CNTR_LOWER_H : BMP_HOR_CNTR_LOWER)));
         aAlignBox.SetItemImage(ITM_HOR_RGHT, Bitmap(SW_RES(bHC ? BMP_HOR_RGHT_LOWER_H : BMP_HOR_RGHT_LOWER)));
@@ -106,7 +104,7 @@ IMPL_LINK( SwEnvPrtPage, ClickHdl, Button *, EMPTYARG )
     }
     else
     {
-        // Briefumschlaege von oben
+        // Envelope from top
         aAlignBox.SetItemImage(ITM_HOR_LEFT, Bitmap(SW_RES(bHC ? BMP_HOR_LEFT_UPPER_H : BMP_HOR_LEFT_UPPER)));
         aAlignBox.SetItemImage(ITM_HOR_CNTR, Bitmap(SW_RES(bHC ? BMP_HOR_CNTR_UPPER_H : BMP_HOR_CNTR_UPPER)));
         aAlignBox.SetItemImage(ITM_HOR_RGHT, Bitmap(SW_RES(bHC ? BMP_HOR_RGHT_UPPER_H : BMP_HOR_RGHT_UPPER)));
@@ -121,7 +119,7 @@ IMPL_LINK( SwEnvPrtPage, ButtonHdl, Button *, pBtn )
 {
     if (pBtn == &aPrtSetup)
     {
-        // Druck-Setup aufrufen
+        // Call printer setup
         if (pPrt)
         {
             PrinterSetupDialog* pDlg = new PrinterSetupDialog(this );
@@ -145,7 +143,7 @@ IMPL_LINK( SwEnvPrtPage, AlignHdl, ToolBox *, EMPTYARG )
     }
     else
     {
-        // GetCurItemId() == 0 ist moeglich!
+        // GetCurItemId() == 0 is possible!
         const SwEnvItem& rItem = (const SwEnvItem&) GetItemSet().Get(FN_ENVELOP);
         aAlignBox.CheckItem((USHORT) rItem.eAlign + ITM_HOR_LEFT, TRUE);
     }
@@ -192,10 +190,7 @@ BOOL SwEnvPrtPage::FillItemSet(SfxItemSet& rSet)
 
 void SwEnvPrtPage::Reset(const SfxItemSet& rSet)
 {
-//    SfxItemSet aSet(rSet);
-//    aSet.Put(GetParent()->aEnvItem);
-
-    // Item auslesen
+    // Read item
     const SwEnvItem& rItem = (const SwEnvItem&) rSet.Get(FN_ENVELOP);
     aAlignBox.CheckItem((USHORT) rItem.eAlign + ITM_HOR_LEFT);