2 files changed, 17 insertions, 96 deletions

diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index 676de78922a4..8ec335b679ed 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -26,7 +26,6 @@
 #include <vcl/msgbox.hxx>
 
 #include "sdattr.hxx"
-#include "brkdlg.hrc"
 #include "sdresid.hxx"
 #include "View.hxx"
 #include "drawview.hxx"
@@ -45,18 +44,16 @@ BreakDlg::BreakDlg(
     DrawDocShell* pShell,
     sal_uLong nSumActionCount,
     sal_uLong nObjCount )
-    : SfxModalDialog     ( pWindow, SdResId( DLG_BREAK ) ),
-      aFtObjInfo            ( this, SdResId( FT_OBJ_INFO ) ),
-      aFtActInfo            ( this, SdResId( FT_ACT_INFO ) ),
-      aFtInsInfo            ( this, SdResId( FT_INS_INFO ) ),
-      aFiObjInfo            ( this, SdResId( FI_OBJ_INFO ) ),
-      aFiActInfo            ( this, SdResId( FI_ACT_INFO ) ),
-      aFiInsInfo            ( this, SdResId( FI_INS_INFO ) ),
-      aBtnCancel            ( this, SdResId( BTN_CANCEL ) ),
-      aLink             ( LINK( this, BreakDlg, UpDate)),
-      mpProgress            ( NULL )
+    : SfxModalDialog(pWindow, "BreakDialog", "modules/sdraw/ui/breakdialog.ui")
+    , aLink( LINK(this, BreakDlg, UpDate))
+    , mpProgress( NULL )
 {
-    aBtnCancel.SetClickHdl( LINK( this, BreakDlg, CancelButtonHdl));
+    get(m_pFiObjInfo, "metafiles");
+    get(m_pFiActInfo, "metaobjects");
+    get(m_pFiInsInfo, "drawingobjects");
+    get(m_pBtnCancel, "cancel");
+
+    m_pBtnCancel->SetClickHdl( LINK( this, BreakDlg, CancelButtonHdl));
 
     mpProgress = new SfxProgress( pShell, SD_RESSTR(STR_BREAK_METAFILE), nSumActionCount*3 );
 
@@ -66,24 +63,19 @@ BreakDlg::BreakDlg(
 
     pDrView = _pDrView;
     bCancel = sal_False;
-
-    FreeResource();
 }
 
 BreakDlg::~BreakDlg()
 {
-    if( mpProgress )
-        delete mpProgress;
-
-    if( pProgrInfo )
-        delete pProgrInfo;
+    delete mpProgress;
+    delete pProgrInfo;
 }
 
 // Control-Handler for cancel button
 IMPL_LINK_NOARG(BreakDlg, CancelButtonHdl)
 {
   bCancel = sal_True;
-  aBtnCancel.Disable();
+  m_pBtnCancel->Disable();
   return( 0L );
 }
 
@@ -114,32 +106,32 @@ IMPL_LINK( BreakDlg, UpDate, void*, nInit )
     OUString info = OUString::number( pProgrInfo->GetCurObj() )
             + "/"
             + OUString::number( pProgrInfo->GetObjCount() );
-    aFiObjInfo.SetText(info);
+    m_pFiObjInfo->SetText(info);
 
     // how many actions are started?
     if(pProgrInfo->GetActionCount() == 0)
     {
-        aFiActInfo.SetText( OUString() );
+        m_pFiActInfo->SetText( OUString() );
     }
     else
     {
         info = OUString::number( pProgrInfo->GetCurAction() )
             + "/"
             + OUString::number( pProgrInfo->GetActionCount() );
-        aFiActInfo.SetText(info);
+        m_pFiActInfo->SetText(info);
     }
 
     // and inserted????
     if(pProgrInfo->GetInsertCount() == 0)
     {
-        aFiInsInfo.SetText( OUString() );
+        m_pFiInsInfo->SetText( OUString() );
     }
     else
     {
         info = OUString::number( pProgrInfo->GetCurInsert() )
             + "/"
             + OUString::number( pProgrInfo->GetInsertCount() );
-        aFiInsInfo.SetText(info);
+        m_pFiInsInfo->SetText(info);
     }
 
     Application::Reschedule();
diff --git a/sd/source/ui/dlg/brkdlg.src b/sd/source/ui/dlg/brkdlg.src
deleted file mode 100644
index d8e87fbeba82..000000000000
--- a/sd/source/ui/dlg/brkdlg.src
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "brkdlg.hrc"
-ModalDialog DLG_BREAK
-{
-    HelpID = "sd:ModalDialog:DLG_BREAK";
-    OutputSize = TRUE;
-    SVLook   = TRUE;
-    Pos      = MAP_APPFONT( 84, 34 );
-    Size     = MAP_APPFONT( 160, 74 );
-    Moveable = TRUE;
-    FixedText FT_OBJ_INFO
-    {
-        Pos = MAP_APPFONT( 6, 6 );
-        Size = MAP_APPFONT( 85, 10 );
-        Text [ en-US ] = "Processing metafile:";
-    };
-    FixedText FT_ACT_INFO
-    {
-        Pos = MAP_APPFONT( 6, 22 );
-        Size = MAP_APPFONT( 106, 10 );
-        Text [ en-US ] = "Broken down metaobjects:";
-    };
-    FixedText FT_INS_INFO
-    {
-        Pos = MAP_APPFONT( 6, 38 );
-        Size = MAP_APPFONT( 90, 10 );
-        Text [ en-US ] = "Inserted drawing objects:";
-    };
-    FixedText FI_OBJ_INFO
-    {
-        Pos  = MAP_APPFONT( 100, 6 );
-        Size = MAP_APPFONT( 154, 10 );
-    };
-    FixedText FI_ACT_INFO
-    {
-        Pos      = MAP_APPFONT( 100, 22 );
-        Size     = MAP_APPFONT( 54, 10 );
-    };
-    FixedText FI_INS_INFO
-    {
-        Pos             = MAP_APPFONT( 100, 38 );
-        Size    = MAP_APPFONT( 54, 10 );
-    };
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT( 55, 54 );
-        Size = MAP_APPFONT( 50, 14 );
-        TabStop = TRUE;
-    };
-    Text [ en-US ] = "Break";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */