Removed several useless macros: UNISTRING, USTR, USTR_ASCII, ASCII_STR, ASCII_STRING, CONST_ASCII, ASCSTR, ASCII, DEFINE_CONST_UNICODE, DEFINE_CONST_OUSTRING

Change-Id: I96d690bf9f9b319e9eeafcf218ec5ce87f21215f
Reviewed-on: https://gerrit.libreoffice.org/1954
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>

4 files changed, 9 insertions, 9 deletions

diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 8d2a58218553..5b8bf1a7ff0a 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -469,10 +469,10 @@ void SfxFrame::GetTargetList( TargetList& rList ) const
     {
         // An empty string for 'No Target'
         rList.push_back( new String() );
-        rList.push_back( new String( DEFINE_CONST_UNICODE( "_top" ) ) );
-        rList.push_back( new String( DEFINE_CONST_UNICODE( "_parent" ) ) );
-        rList.push_back( new String( DEFINE_CONST_UNICODE( "_blank" ) ) );
-        rList.push_back( new String( DEFINE_CONST_UNICODE( "_self" ) ) );
+        rList.push_back( new String( "_top" ) );
+        rList.push_back( new String( "_parent" ) );
+        rList.push_back( new String( "_blank" ) );
+        rList.push_back( new String( "_self" ) );
     }
 
     SfxViewFrame* pView = GetCurrentViewFrame();
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index 3b4c060de69f..99ee9b5ce7df 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -229,7 +229,7 @@ Reference < XFrame > SfxFrame::CreateBlankFrame()
     try
     {
         Reference < XDesktop2 > xDesktop = Desktop::create( ::comphelper::getProcessComponentContext() );
-        xFrame.set( xDesktop->findFrame( DEFINE_CONST_UNICODE("_blank"), 0 ), UNO_SET_THROW );
+        xFrame.set( xDesktop->findFrame( "_blank", 0 ), UNO_SET_THROW );
     }
     catch( const Exception& )
     {
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 5cdfe81dccbe..5658727c572e 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1888,7 +1888,7 @@ SfxViewFrame* SfxViewFrame::LoadViewIntoFrame_Impl_NoThrow( const SfxObjectShell
             }
 
             if ( !xFrame.is() )
-                xFrame.set( xDesktop->findFrame( DEFINE_CONST_UNICODE("_blank"), 0 ), UNO_SET_THROW );
+                xFrame.set( xDesktop->findFrame( "_blank", 0 ), UNO_SET_THROW );
 
             bOwnFrame = true;
         }
@@ -3104,7 +3104,7 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
         if (!SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SDATABASE))
             return;
         Reference < XFrame > xFrame = GetFrame().GetTopFrame().GetFrameInterface();
-        Reference < XFrame > xBeamer( xFrame->findFrame( DEFINE_CONST_UNICODE("_beamer"), FrameSearchFlag::CHILDREN ) );
+        Reference < XFrame > xBeamer( xFrame->findFrame( "_beamer", FrameSearchFlag::CHILDREN ) );
         sal_Bool bShow = sal_False;
         sal_Bool bHasChild = xBeamer.is();
         bShow = pShowItem ? pShowItem->GetValue() : !bHasChild;
@@ -3207,7 +3207,7 @@ void SfxViewFrame::ChildWindowState( SfxItemSet& rState )
         else if ( nSID == SID_BROWSER )
         {
             Reference < XFrame > xFrame = GetFrame().GetTopFrame().GetFrameInterface()->
-                            findFrame( DEFINE_CONST_UNICODE("_beamer"), FrameSearchFlag::CHILDREN );
+                            findFrame( "_beamer", FrameSearchFlag::CHILDREN );
             if ( !xFrame.is() )
                 rState.DisableItem( nSID );
             else if ( KnowsChildWindow(nSID) )
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 6a0a9faf4b43..9255a3a14a01 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -659,7 +659,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
     // no help button in dialogs if called from the help window
     // (pressing help button would exchange the current page inside the help
     // document that is going to be printed!)
-    String aHelpFilterName( DEFINE_CONST_UNICODE("writer_web_HTML_help") );
+    String aHelpFilterName( "writer_web_HTML_help" );
     SfxMedium* pMedium = GetViewFrame()->GetObjectShell()->GetMedium();
     const SfxFilter* pFilter = pMedium ? pMedium->GetFilter() : NULL;
     sal_Bool bPrintOnHelp = ( pFilter && pFilter->GetFilterName() == aHelpFilterName );