Remove uses of rtl::OUString::compareToAscii(asciiStr, maxLength)

...which is a confusing overload with unexpectedly different semantics from the
one-parameter form.  In preparation of marking it as deprecated.

Change-Id: I4f176995546ae583fc570d770647ffc315eecc75

7 files changed, 7 insertions, 13 deletions

diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx
index 331243b11f77..40f6a9102360 100644
--- a/framework/source/dispatch/mailtodispatcher.cxx
+++ b/framework/source/dispatch/mailtodispatcher.cxx
@@ -30,9 +30,6 @@
 
 namespace framework{
 
-#define PROTOCOL_VALUE      "mailto:"
-#define PROTOCOL_LENGTH     7
-
 //_________________________________________________________________________________________________________________
 // XInterface, XTypeProvider, XServiceInfo
 
@@ -111,7 +108,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL MailToDispatcher::queryDis
                                                                                              sal_Int32        /*nFlags*/  ) throw( css::uno::RuntimeException )
 {
     css::uno::Reference< css::frame::XDispatch > xDispatcher;
-    if (aURL.Complete.compareToAscii(PROTOCOL_VALUE,PROTOCOL_LENGTH)==0)
+    if (aURL.Complete.startsWith("mailto:"))
         xDispatcher = this;
     return xDispatcher;
 }
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx
index 30b271f30a06..f4d60b334951 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -55,9 +55,6 @@ using namespace ::cppu                          ;
 using namespace ::osl                           ;
 using namespace ::rtl                           ;
 
-const char*     PROTOCOL_VALUE      = "vnd.sun.star.popup:";
-const sal_Int32 PROTOCOL_LENGTH     = 19;
-
 //*****************************************************************************************************************
 //  constructor
 //*****************************************************************************************************************
@@ -216,7 +213,7 @@ throw( css::uno::RuntimeException )
 {
     css::uno::Reference< css::frame::XDispatch > xDispatch;
 
-    if ( rURL.Complete.compareToAscii( PROTOCOL_VALUE, PROTOCOL_LENGTH ) == 0 )
+    if ( rURL.Complete.startsWith( "vnd.sun.star.popup:" ) )
     {
         // --- SAFE ---
         ResetableGuard aGuard( m_aLock );
diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx
index ddeac81e3b20..ddd6c681cf39 100644
--- a/framework/source/dispatch/servicehandler.cxx
+++ b/framework/source/dispatch/servicehandler.cxx
@@ -110,7 +110,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL ServiceHandler::queryDispa
                                                                                            sal_Int32        /*nFlags*/  ) throw( css::uno::RuntimeException )
 {
     css::uno::Reference< css::frame::XDispatch > xDispatcher;
-    if (aURL.Complete.compareToAscii(PROTOCOL_VALUE,PROTOCOL_LENGTH)==0)
+    if (aURL.Complete.startsWith(PROTOCOL_VALUE))
         xDispatcher = this;
     return xDispatcher;
 }
diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx
index 16d1fa85203a..b06b76498ccf 100644
--- a/framework/source/dispatch/systemexec.cxx
+++ b/framework/source/dispatch/systemexec.cxx
@@ -94,7 +94,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL SystemExec::queryDispatch(
                                                                                        sal_Int32 ) throw( css::uno::RuntimeException )
 {
     css::uno::Reference< css::frame::XDispatch > xDispatcher;
-    if (aURL.Complete.compareToAscii(PROTOCOL_VALUE,PROTOCOL_LENGTH)==0)
+    if (aURL.Complete.startsWith(PROTOCOL_VALUE))
         xDispatcher = this;
     return xDispatcher;
 }
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 47c4efbc2077..6b9aefa75ef1 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -1277,7 +1277,7 @@ sal_Bool AddonsOptions_Impl::HasAssociatedImages( const OUString& aURL )
 //*****************************************************************************************************************
 void AddonsOptions_Impl::SubstituteVariables( OUString& aURL )
 {
-    if (( aURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM( EXPAND_PROTOCOL )) == 0 ) )
+    if ( aURL.startsWith( EXPAND_PROTOCOL ) )
     {
         // cut protocol
         OUString macro( aURL.copy( sizeof ( EXPAND_PROTOCOL ) -1 ) );
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index 9390838e1fdf..e790afda932d 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -83,7 +83,7 @@ uno::Reference< util::XMacroExpander > GetMacroExpander()
 
 static void SubstituteVariables( OUString& aURL )
 {
-    if ( aURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM( EXPAND_PROTOCOL )) == 0 )
+    if ( aURL.startsWith( EXPAND_PROTOCOL ) )
     {
         uno::Reference< util::XMacroExpander > xMacroExpander = GetMacroExpander();
 
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index b47ee8f951bc..661942c9ee5c 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1256,7 +1256,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
                     if ( aProp[i].Name == ITEM_DESCRIPTOR_COMMANDURL )
                     {
                         aProp[i].Value >>= aCommandURL;
-                        if ( aCommandURL.compareToAscii(MENUPREFIX, RTL_CONSTASCII_LENGTH(MENUPREFIX) ) == 0  )
+                        if ( aCommandURL.startsWith(MENUPREFIX) )
                         {
                             try
                             {