equalsAscii -> equalsAsciiL

6 files changed, 42 insertions, 42 deletions

diff --git a/oox/inc/oox/ole/axcontrol.hxx b/oox/inc/oox/ole/axcontrol.hxx
index eccd5865cfa9..ae4305b5ae7a 100644
--- a/oox/inc/oox/ole/axcontrol.hxx
+++ b/oox/inc/oox/ole/axcontrol.hxx
@@ -55,24 +55,24 @@ namespace ole {
 
 // ============================================================================
 
-const sal_Char* const COMCTL_GUID_SCROLLBAR_60      = "{FE38753A-44A3-11D1-B5B7-0000C09000C4}";
-const sal_Char* const COMCTL_GUID_PROGRESSBAR_50    = "{0713E8D2-850A-101B-AFC0-4210102A8DA7}";
-const sal_Char* const COMCTL_GUID_PROGRESSBAR_60    = "{35053A22-8589-11D1-B16A-00C0F0283628}";
+#define COMCTL_GUID_SCROLLBAR_60   "{FE38753A-44A3-11D1-B5B7-0000C09000C4}"
+#define COMCTL_GUID_PROGRESSBAR_50 "{0713E8D2-850A-101B-AFC0-4210102A8DA7}"
+#define COMCTL_GUID_PROGRESSBAR_60 "{35053A22-8589-11D1-B16A-00C0F0283628}"
 
 // ----------------------------------------------------------------------------
 
-const sal_Char* const AX_GUID_COMMANDBUTTON = "{D7053240-CE69-11CD-A777-00DD01143C57}";
-const sal_Char* const AX_GUID_LABEL         = "{978C9E23-D4B0-11CE-BF2D-00AA003F40D0}";
-const sal_Char* const AX_GUID_IMAGE         = "{4C599241-6926-101B-9992-00000B65C6F9}";
-const sal_Char* const AX_GUID_TOGGLEBUTTON  = "{8BD21D60-EC42-11CE-9E0D-00AA006002F3}";
-const sal_Char* const AX_GUID_CHECKBOX      = "{8BD21D40-EC42-11CE-9E0D-00AA006002F3}";
-const sal_Char* const AX_GUID_OPTIONBUTTON  = "{8BD21D50-EC42-11CE-9E0D-00AA006002F3}";
-const sal_Char* const AX_GUID_TEXTBOX       = "{8BD21D10-EC42-11CE-9E0D-00AA006002F3}";
-const sal_Char* const AX_GUID_LISTBOX       = "{8BD21D20-EC42-11CE-9E0D-00AA006002F3}";
-const sal_Char* const AX_GUID_COMBOBOX      = "{8BD21D30-EC42-11CE-9E0D-00AA006002F3}";
-const sal_Char* const AX_GUID_SPINBUTTON    = "{79176FB0-B7F2-11CE-97EF-00AA006D2776}";
-const sal_Char* const AX_GUID_SCROLLBAR     = "{DFD181E0-5E2F-11CE-A449-00AA004A803D}";
-const sal_Char* const AX_GUID_FRAME         = "{6E182020-F460-11CE-9BCD-00AA00608E01}";
+#define AX_GUID_COMMANDBUTTON "{D7053240-CE69-11CD-A777-00DD01143C57}"
+#define AX_GUID_LABEL         "{978C9E23-D4B0-11CE-BF2D-00AA003F40D0}"
+#define AX_GUID_IMAGE         "{4C599241-6926-101B-9992-00000B65C6F9}"
+#define AX_GUID_TOGGLEBUTTON  "{8BD21D60-EC42-11CE-9E0D-00AA006002F3}"
+#define AX_GUID_CHECKBOX      "{8BD21D40-EC42-11CE-9E0D-00AA006002F3}"
+#define AX_GUID_OPTIONBUTTON  "{8BD21D50-EC42-11CE-9E0D-00AA006002F3}"
+#define AX_GUID_TEXTBOX       "{8BD21D10-EC42-11CE-9E0D-00AA006002F3}"
+#define AX_GUID_LISTBOX       "{8BD21D20-EC42-11CE-9E0D-00AA006002F3}"
+#define AX_GUID_COMBOBOX      "{8BD21D30-EC42-11CE-9E0D-00AA006002F3}"
+#define AX_GUID_SPINBUTTON    "{79176FB0-B7F2-11CE-97EF-00AA006D2776}"
+#define AX_GUID_SCROLLBAR     "{DFD181E0-5E2F-11CE-A449-00AA004A803D}"
+#define AX_GUID_FRAME         "{6E182020-F460-11CE-9BCD-00AA00608E01}"
 
 const sal_uInt32 AX_SYSCOLOR_WINDOWBACK     = 0x80000005;
 const sal_uInt32 AX_SYSCOLOR_WINDOWFRAME    = 0x80000006;
diff --git a/oox/inc/oox/ole/olehelper.hxx b/oox/inc/oox/ole/olehelper.hxx
index 58205a4b64e3..9bfd290e1211 100644
--- a/oox/inc/oox/ole/olehelper.hxx
+++ b/oox/inc/oox/ole/olehelper.hxx
@@ -42,9 +42,9 @@ namespace ole {
 
 // ============================================================================
 
-const sal_Char* const OLE_GUID_STDFONT      = "{0BE35203-8F91-11CE-9DE3-00AA004BB851}";
-const sal_Char* const OLE_GUID_STDPIC       = "{0BE35204-8F91-11CE-9DE3-00AA004BB851}";
-const sal_Char* const OLE_GUID_STDHLINK     = "{79EAC9D0-BAF9-11CE-8C82-00AA004BA90B}";
+#define OLE_GUID_STDFONT "{0BE35203-8F91-11CE-9DE3-00AA004BB851}"
+#define OLE_GUID_STDPIC  "{0BE35204-8F91-11CE-9DE3-00AA004BB851}"
+#define OLE_GUID_STDHLINK "{79EAC9D0-BAF9-11CE-8C82-00AA004BA90B}"
 
 // ============================================================================
 
diff --git a/oox/source/ole/axbinaryreader.cxx b/oox/source/ole/axbinaryreader.cxx
index 585ed4f22c22..e36021f28429 100644
--- a/oox/source/ole/axbinaryreader.cxx
+++ b/oox/source/ole/axbinaryreader.cxx
@@ -150,7 +150,7 @@ bool AxFontData::importGuidAndFont( BinaryInputStream& rInStrm )
     OUString aGuid = OleHelper::importGuid( rInStrm );
     if( aGuid.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "{AFC20920-DA4E-11CE-B943-00AA006887B4}" ) ) )
         return importBinaryModel( rInStrm );
-    if( aGuid.equalsAscii( OLE_GUID_STDFONT ) )
+    if( aGuid.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(OLE_GUID_STDFONT) ) )
         return importStdFont( rInStrm );
     return false;
 }
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index bd484dc8d92b..39bc7272210a 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -1762,31 +1762,31 @@ EmbeddedControl::~EmbeddedControl()
 ControlModelRef EmbeddedControl::createModel( const OUString& rClassId )
 {
     OUString aClassId = rClassId.toAsciiUpperCase();
-    if( aClassId.equalsAscii( AX_GUID_COMMANDBUTTON ) )
+    if( aClassId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(AX_GUID_COMMANDBUTTON)) )
         mxModel.reset( new AxCommandButtonModel );
-    else if( aClassId.equalsAscii( AX_GUID_LABEL ) )
+    else if( aClassId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(AX_GUID_LABEL)) )
         mxModel.reset( new AxLabelModel );
-    else if( aClassId.equalsAscii( AX_GUID_IMAGE ) )
+    else if( aClassId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(AX_GUID_IMAGE)) )
         mxModel.reset( new AxImageModel );
-    else if( aClassId.equalsAscii( AX_GUID_TOGGLEBUTTON ) )
+    else if( aClassId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(AX_GUID_TOGGLEBUTTON)) )
         mxModel.reset( new AxToggleButtonModel );
-    else if( aClassId.equalsAscii( AX_GUID_CHECKBOX ) )
+    else if( aClassId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(AX_GUID_CHECKBOX)) )
         mxModel.reset( new AxCheckBoxModel );
-    else if( aClassId.equalsAscii( AX_GUID_OPTIONBUTTON ) )
+    else if( aClassId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(AX_GUID_OPTIONBUTTON)) )
         mxModel.reset( new AxOptionButtonModel );
-    else if( aClassId.equalsAscii( AX_GUID_TEXTBOX ) )
+    else if( aClassId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(AX_GUID_TEXTBOX)) )
         mxModel.reset( new AxTextBoxModel );
-    else if( aClassId.equalsAscii( AX_GUID_LISTBOX ) )
+    else if( aClassId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(AX_GUID_LISTBOX)) )
         mxModel.reset( new AxListBoxModel );
-    else if( aClassId.equalsAscii( AX_GUID_COMBOBOX ) )
+    else if( aClassId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(AX_GUID_COMBOBOX)) )
         mxModel.reset( new AxComboBoxModel );
-    else if( aClassId.equalsAscii( AX_GUID_SPINBUTTON ) )
+    else if( aClassId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(AX_GUID_SPINBUTTON)) )
         mxModel.reset( new AxSpinButtonModel );
-    else if( aClassId.equalsAscii( AX_GUID_SCROLLBAR ) )
+    else if( aClassId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(AX_GUID_SCROLLBAR)) )
         mxModel.reset( new AxScrollBarModel );
-    else if( aClassId.equalsAscii( AX_GUID_FRAME ) )
+    else if( aClassId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(AX_GUID_FRAME)) )
         mxModel.reset( new AxFrameModel );
-    else if( aClassId.equalsAscii( COMCTL_GUID_SCROLLBAR_60 ) )
+    else if( aClassId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(COMCTL_GUID_SCROLLBAR_60)) )
         mxModel.reset( new ComCtlScrollBarModel( 6 ) );
     else
         mxModel.reset();
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index 271987b417fa..37948dad0f0a 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -60,8 +60,8 @@ inline sal_Int32 lclDecodeBgrColor( sal_uInt32 nOleColor )
 
 // ----------------------------------------------------------------------------
 
-const sal_Char* const OLE_GUID_URLMONIKER   = "{79EAC9E0-BAF9-11CE-8C82-00AA004BA90B}";
-const sal_Char* const OLE_GUID_FILEMONIKER  = "{00000303-0000-0000-C000-000000000046}";
+const sal_Char OLE_GUID_URLMONIKER[] = "{79EAC9E0-BAF9-11CE-8C82-00AA004BA90B}";
+const sal_Char OLE_GUID_FILEMONIKER[] = "{00000303-0000-0000-C000-000000000046}";
 
 const sal_uInt32 OLE_STDPIC_ID              = 0x0000746C;
 
@@ -185,7 +185,7 @@ StdFontInfo::StdFontInfo( const ::rtl::OUString& rName, sal_uInt32 nHeight,
 {
     if( bWithGuid )
     {
-        bool bIsStdFont = importGuid( rInStrm ).equalsAscii( OLE_GUID_STDFONT );
+        bool bIsStdFont = importGuid( rInStrm ).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(OLE_GUID_STDFONT));
         OSL_ENSURE( bIsStdFont, "OleHelper::importStdFont - unexpected header GUID, expected StdFont" );
         if( !bIsStdFont )
             return false;
@@ -203,7 +203,7 @@ StdFontInfo::StdFontInfo( const ::rtl::OUString& rName, sal_uInt32 nHeight,
 {
     if( bWithGuid )
     {
-        bool bIsStdPic = importGuid( rInStrm ).equalsAscii( OLE_GUID_STDPIC );
+        bool bIsStdPic = importGuid( rInStrm ).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(OLE_GUID_STDPIC));
         OSL_ENSURE( bIsStdPic, "OleHelper::importStdPic - unexpected header GUID, expected StdPic" );
         if( !bIsStdPic )
             return false;
@@ -220,7 +220,7 @@ StdFontInfo::StdFontInfo( const ::rtl::OUString& rName, sal_uInt32 nHeight,
 {
     if( bWithGuid )
     {
-        bool bIsStdHlink = importGuid( rInStrm ).equalsAscii( OLE_GUID_STDHLINK );
+        bool bIsStdHlink = importGuid( rInStrm ).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(OLE_GUID_STDHLINK));
         OSL_ENSURE( bIsStdHlink, "OleHelper::importStdHlink - unexpected header GUID, expected StdHlink" );
         if( !bIsStdHlink )
             return false;
@@ -250,7 +250,7 @@ StdFontInfo::StdFontInfo( const ::rtl::OUString& rName, sal_uInt32 nHeight,
         else // hyperlink moniker
         {
             OUString aGuid = importGuid( rInStrm );
-            if( aGuid.equalsAscii( OLE_GUID_FILEMONIKER ) )
+            if( aGuid.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(OLE_GUID_FILEMONIKER)) )
             {
                 // file name, maybe relative and with directory up-count
                 sal_Int16 nUpLevels;
@@ -271,7 +271,7 @@ StdFontInfo::StdFontInfo( const ::rtl::OUString& rName, sal_uInt32 nHeight,
                     for( sal_Int16 nLevel = 0; nLevel < nUpLevels; ++nLevel )
                         orHlinkInfo.maTarget = CREATE_OUSTRING( "../" ) + orHlinkInfo.maTarget;
             }
-            else if( aGuid.equalsAscii( OLE_GUID_URLMONIKER ) )
+            else if( aGuid.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(OLE_GUID_URLMONIKER)) )
             {
                 // URL, maybe relative and with leading '../'
                 sal_Int32 nBytes = rInStrm.readInt32();
diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
index 4a42f7043aaf..1630b787f3f1 100644
--- a/oox/source/ole/vbacontrol.cxx
+++ b/oox/source/ole/vbacontrol.cxx
@@ -288,11 +288,11 @@ ControlModelRef VbaSiteModel::createControlModel( const AxClassTable& rClassTabl
         OSL_ENSURE( pGuid, "VbaSiteModel::createControlModel - invalid class table index" );
         if( pGuid )
         {
-            if( pGuid->equalsAscii( COMCTL_GUID_SCROLLBAR_60 ) )
+            if( pGuid->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(COMCTL_GUID_SCROLLBAR_60)) )
                 xCtrlModel.reset( new ComCtlScrollBarModel( 6 ) );
-            else if( pGuid->equalsAscii( COMCTL_GUID_PROGRESSBAR_50 ) )
+            else if( pGuid->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(COMCTL_GUID_PROGRESSBAR_50)) )
                 xCtrlModel.reset( new ComCtlProgressBarModel( 5 ) );
-            else if( pGuid->equalsAscii( COMCTL_GUID_PROGRESSBAR_60 ) )
+            else if( pGuid->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(COMCTL_GUID_PROGRESSBAR_60)) )
                 xCtrlModel.reset( new ComCtlProgressBarModel( 6 ) );
         }
     }