cws tl74: #i107721#, #i108358# fixed broken SVX_RES to CUI_RES after merging to m73 where those dialogs got moved to cui project

4 files changed, 37 insertions, 43 deletions

diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index 5095593fd7fe..08bb656fe82b 100755
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -157,17 +157,17 @@ SvxHyphenWordDialog_Impl::SvxHyphenWordDialog_Impl(
         SvxSpellWrapper* pWrapper ) :
 
     m_pDialog   ( pDialog ),
-    aWordFT     ( pDialog, SVX_RES( FT_WORD ) ),
-    aWordEdit   ( pDialog, SVX_RES( ED_WORD ) ),
-    aLeftBtn    ( pDialog, SVX_RES( BTN_LEFT ) ),
-    aRightBtn   ( pDialog, SVX_RES( BTN_RIGHT ) ),
-    aOkBtn      ( pDialog, SVX_RES( BTN_HYPH_CUT ) ),
-    aContBtn    ( pDialog, SVX_RES( BTN_HYPH_CONTINUE ) ),
-    aDelBtn     ( pDialog, SVX_RES( BTN_HYPH_DELETE ) ),
-    aFLBottom   ( pDialog, SVX_RES( FL_BOTTOM ) ),
-    aHelpBtn    ( pDialog, SVX_RES( BTN_HYPH_HELP ) ),
-    aHyphAll    ( pDialog, SVX_RES( BTN_HYPH_ALL ) ),
-    aCancelBtn  ( pDialog, SVX_RES( BTN_HYPH_CANCEL ) ),
+    aWordFT     ( pDialog, CUI_RES( FT_WORD ) ),
+    aWordEdit   ( pDialog, CUI_RES( ED_WORD ) ),
+    aLeftBtn    ( pDialog, CUI_RES( BTN_LEFT ) ),
+    aRightBtn   ( pDialog, CUI_RES( BTN_RIGHT ) ),
+    aOkBtn      ( pDialog, CUI_RES( BTN_HYPH_CUT ) ),
+    aContBtn    ( pDialog, CUI_RES( BTN_HYPH_CONTINUE ) ),
+    aDelBtn     ( pDialog, CUI_RES( BTN_HYPH_DELETE ) ),
+    aFLBottom   ( pDialog, CUI_RES( FL_BOTTOM ) ),
+    aHelpBtn    ( pDialog, CUI_RES( BTN_HYPH_HELP ) ),
+    aHyphAll    ( pDialog, CUI_RES( BTN_HYPH_ALL ) ),
+    aCancelBtn  ( pDialog, CUI_RES( BTN_HYPH_CANCEL ) ),
     aLabel          ( pDialog->GetText() ),
     pHyphWrapper    ( NULL ),
     xHyphenator     ( NULL ),
@@ -500,9 +500,9 @@ SvxHyphenWordDialog::SvxHyphenWordDialog(
     uno::Reference< linguistic2::XHyphenator >  &xHyphen,
     SvxSpellWrapper* pWrapper ) :
 
-    SfxModalDialog( pParent, SVX_RES( RID_SVXDLG_HYPHENATE ) )
+    SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_HYPHENATE ) )
 {
-    m_pImpl = boost::shared_ptr< SvxHyphenWordDialog_Impl >(
+    m_pImpl = std::auto_ptr< SvxHyphenWordDialog_Impl >(
             new SvxHyphenWordDialog_Impl( this, rWord, nLang, xHyphen, pWrapper ) );
 
     FreeResource();
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index f456832c6d16..bf617b126747 100755
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -29,17 +29,11 @@
 
 #include "precompiled_cui.hxx"
 
-#include "cuires.hrc"
 #include "thesdlg.hrc"
 #include "thesdlg.hxx"
 #include "thesdlg_impl.hxx"
-
-//#include <svx/dialmgr.hxx>
-//#include <svx/dialogs.hrc>
-//#include <svx/langbox.hxx>
-//#include <svx/checklbx.hxx>
-//#include <dlgutil.hxx>
-//#include <svxerr.hxx>
+#include "cuires.hrc"
+#include "dialmgr.hxx"
 
 #include <editeng/unolingu.hxx>
 #include <tools/shl.hxx>
@@ -203,7 +197,7 @@ void AlternativesString_Impl::Paint(
 ThesaurusAlternativesCtrl_Impl::ThesaurusAlternativesCtrl_Impl(
         Window* pParent,
         SvxThesaurusDialog_Impl &rImpl ) :
-    SvxCheckListBox( pParent, SVX_RES( CT_THES_ALTERNATIVES ) ),
+    SvxCheckListBox( pParent, CUI_RES( CT_THES_ALTERNATIVES ) ),
     m_rDialogImpl( rImpl )
 {
     SetWindowBits( WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE );
@@ -291,22 +285,22 @@ void ThesaurusAlternativesCtrl_Impl::Paint( const Rectangle& rRect )
 
 SvxThesaurusDialog_Impl::SvxThesaurusDialog_Impl( SvxThesaurusDialog * pDialog ) :
     m_pDialog       ( pDialog ),
-    aVendorImageFI  ( pDialog , SVX_RES( IMG_VENDOR ) ),
-    aLeftBtn        ( pDialog, SVX_RES( BTN_LEFT ) ),
-    aWordText       ( pDialog, SVX_RES( FT_WORD ) ),
-    aWordCB         ( pDialog, SVX_RES( CB_WORD ), *this ),
-    m_aAlternativesText  ( pDialog, SVX_RES( FT_THES_ALTERNATIVES ) ),
+    aVendorImageFI  ( pDialog, CUI_RES( IMG_VENDOR ) ),
+    aLeftBtn        ( pDialog, CUI_RES( BTN_LEFT ) ),
+    aWordText       ( pDialog, CUI_RES( FT_WORD ) ),
+    aWordCB         ( pDialog, CUI_RES( CB_WORD ), *this ),
+    m_aAlternativesText  ( pDialog, CUI_RES( FT_THES_ALTERNATIVES ) ),
     m_pAlternativesCT    ( new ThesaurusAlternativesCtrl_Impl( pDialog, *this ) ),
-    aReplaceText    ( pDialog, SVX_RES( FT_REPL ) ),
-    aReplaceEdit    ( pDialog, SVX_RES( ED_REPL ) ),
-    aFL             ( pDialog, SVX_RES( FL_VAR ) ),
-    aHelpBtn        ( pDialog, SVX_RES( BTN_THES_HELP ) ),
-    aLangMBtn       ( pDialog, SVX_RES( MB_LANGUAGE ) ),
-    aReplaceBtn     ( pDialog, SVX_RES( BTN_THES_OK ) ),
-    aCancelBtn      ( pDialog, SVX_RES( BTN_THES_CANCEL ) ),
-    aErrStr                 ( SVX_RES( STR_ERR_TEXTNOTFOUND ) ),
-    aVendorDefaultImage     ( SVX_RES( IMG_DEFAULT_VENDOR ) ),
-    aVendorDefaultImageHC   ( SVX_RES( IMG_DEFAULT_VENDOR_HC ) ),
+    aReplaceText    ( pDialog, CUI_RES( FT_REPL ) ),
+    aReplaceEdit    ( pDialog, CUI_RES( ED_REPL ) ),
+    aFL             ( pDialog, CUI_RES( FL_VAR ) ),
+    aHelpBtn        ( pDialog, CUI_RES( BTN_THES_HELP ) ),
+    aLangMBtn       ( pDialog, CUI_RES( MB_LANGUAGE ) ),
+    aReplaceBtn     ( pDialog, CUI_RES( BTN_THES_OK ) ),
+    aCancelBtn      ( pDialog, CUI_RES( BTN_THES_CANCEL ) ),
+    aErrStr                 ( CUI_RES( STR_ERR_TEXTNOTFOUND ) ),
+    aVendorDefaultImage     ( CUI_RES( IMG_DEFAULT_VENDOR ) ),
+    aVendorDefaultImageHC   ( CUI_RES( IMG_DEFAULT_VENDOR_HC ) ),
     xThesaurus      ( NULL ),
     aLookUpText     (),
     nLookUpLanguage ( LANGUAGE_NONE ),
@@ -663,9 +657,9 @@ SvxThesaurusDialog::SvxThesaurusDialog(
     const String &rWord,
     LanguageType nLanguage ) :
 
-    SvxStandardDialog( pParent, SVX_RES( RID_SVXDLG_THESAURUS ) )
+    SvxStandardDialog( pParent, CUI_RES( RID_SVXDLG_THESAURUS ) )
 {
-    m_pImpl = boost::shared_ptr< SvxThesaurusDialog_Impl >(new SvxThesaurusDialog_Impl( this ));
+    m_pImpl = std::auto_ptr< SvxThesaurusDialog_Impl >(new SvxThesaurusDialog_Impl( this ));
 
     m_pImpl->xThesaurus = xThes;
     m_pImpl->aLookUpText = OUString( rWord );
diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx
index 48f4a31705d0..e28150ea7e4a 100755
--- a/cui/source/inc/hyphen.hxx
+++ b/cui/source/inc/hyphen.hxx
@@ -29,7 +29,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <vcl/edit.hxx>
 #include <vcl/button.hxx>
@@ -64,7 +64,7 @@ struct SvxHyphenWordDialog_Impl;
 
 class SvxHyphenWordDialog : public SfxModalDialog
 {
-    boost::shared_ptr< SvxHyphenWordDialog_Impl > m_pImpl;
+    std::auto_ptr< SvxHyphenWordDialog_Impl > m_pImpl;
 
 public:
     SvxHyphenWordDialog( const String &rWord, LanguageType nLang,
diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx
index f5d0bd91b584..99b292b560a5 100755
--- a/cui/source/inc/thesdlg.hxx
+++ b/cui/source/inc/thesdlg.hxx
@@ -33,7 +33,7 @@
 #include "svx/stddlg.hxx"
 #include "svx/svxdllapi.h"
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 
 /////////////////////////////////////////////////////////////////
@@ -42,7 +42,7 @@ struct SvxThesaurusDialog_Impl;
 
 class SvxThesaurusDialog : public SvxStandardDialog
 {
-    boost::shared_ptr< SvxThesaurusDialog_Impl > m_pImpl;
+    std::auto_ptr< SvxThesaurusDialog_Impl > m_pImpl;
 
     SVX_DLLPRIVATE virtual void     Apply();