[Libreoffice-commits] .: 2 commits - binfilter/bf_basic binfilter/bf_sc binfilter/bf_sfx2 binfilter/bf_so3 filter/source oox/inc oox/source
Caolán McNamara
caolan at kemper.freedesktop.org
Sat Jan 29 09:57:29 PST 2011
binfilter/bf_basic/source/comp/codegen.cxx | 6 +--
binfilter/bf_basic/source/sbx/sbxsng.cxx | 9 +----
binfilter/bf_basic/source/sbx/sbxulng.cxx | 7 ----
binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx | 24 --------------
binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx | 35 ++++++---------------
binfilter/bf_sc/source/ui/unoobj/sc_filtuno.cxx | 12 -------
binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx | 5 ---
binfilter/bf_so3/source/persist/persist.cxx | 4 --
filter/source/graphicfilter/icgm/class1.cxx | 2 -
oox/inc/oox/ole/axcontrol.hxx | 30 +++++++++---------
oox/inc/oox/ole/olehelper.hxx | 6 +--
oox/source/ole/axbinaryreader.cxx | 2 -
oox/source/ole/axcontrol.cxx | 26 +++++++--------
oox/source/ole/olehelper.cxx | 14 ++++----
oox/source/ole/vbacontrol.cxx | 6 +--
15 files changed, 60 insertions(+), 128 deletions(-)
New commits:
commit 267330f6d7bd75fe8b5f16544c248d552d2b9709
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 29 17:12:05 2011 +0000
WaE: various new gcc 4.6.0 warnings
diff --git a/binfilter/bf_basic/source/comp/codegen.cxx b/binfilter/bf_basic/source/comp/codegen.cxx
index 7016206..2d693ae 100644
--- a/binfilter/bf_basic/source/comp/codegen.cxx
+++ b/binfilter/bf_basic/source/comp/codegen.cxx
@@ -32,6 +32,7 @@
#include "opcodes.hxx"
#include "codegen.hxx"
#include <limits>
+#include <algorithm>
namespace binfilter {
@@ -127,10 +128,7 @@ public:
T result = 0 ;
static const S max = std::numeric_limits< S >::max();
result = m_nNumOp0 + ( ( sizeof(S) + 1 ) * m_nNumSingleParams ) + ( (( sizeof(S) * 2 )+ 1 ) * m_nNumDoubleParams );
- if ( result > max )
- return max;
-
- return static_cast<S>(result);
+ return std::min(static_cast<T>(max), result);
}
virtual bool processParams(){ return false; }
};
diff --git a/binfilter/bf_basic/source/sbx/sbxsng.cxx b/binfilter/bf_basic/source/sbx/sbxsng.cxx
index 7e5732d..dc9b370 100644
--- a/binfilter/bf_basic/source/sbx/sbxsng.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxsng.cxx
@@ -338,18 +338,13 @@ start:
case SbxBYREF | SbxSALUINT64:
*p->puInt64 = ImpDoubleToSalUInt64( (double) n ); break;
case SbxBYREF | SbxCURRENCY:
- double d;
if( n > SbxMAXCURR )
{
- SbxBase::SetError( SbxERR_OVERFLOW ); d = SbxMAXCURR;
+ SbxBase::SetError( SbxERR_OVERFLOW );
}
else if( n < SbxMINCURR )
{
- SbxBase::SetError( SbxERR_OVERFLOW ); d = SbxMINCURR;
- }
- else
- {
- d = n;
+ SbxBase::SetError( SbxERR_OVERFLOW );
}
*p->pLong64 = ImpDoubleToCurrency( n ); break;
diff --git a/binfilter/bf_basic/source/sbx/sbxulng.cxx b/binfilter/bf_basic/source/sbx/sbxulng.cxx
index da49619..0471bb0 100644
--- a/binfilter/bf_basic/source/sbx/sbxulng.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxulng.cxx
@@ -304,14 +304,9 @@ start:
case SbxBYREF | SbxSALUINT64:
*p->puInt64 = n; break;
case SbxBYREF | SbxCURRENCY:
- double d;
if( n > SbxMAXCURR )
{
- SbxBase::SetError( SbxERR_OVERFLOW ); d = SbxMAXCURR;
- }
- else
- {
- d = n;
+ SbxBase::SetError( SbxERR_OVERFLOW );
}
*p->pLong64 = ImpDoubleToCurrency( n ); break;
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx b/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
index c7ebb66..3a3696e 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
@@ -201,7 +201,6 @@ namespace binfilter {
/*N*/
/*N*/ if ( bQuery || bSort || bSubTotal )
/*N*/ {
-/*N*/ BOOL bQuerySize = FALSE;
/*N*/ ScRange aOldQuery;
/*N*/ ScRange aNewQuery;
/*N*/ if (bQuery && !aQueryParam.bInplace)
@@ -209,10 +208,7 @@ namespace binfilter {
/*N*/ ScDBData* pDest = pDoc->GetDBAtCursor( aQueryParam.nDestCol, aQueryParam.nDestRow,
/*N*/ aQueryParam.nDestTab, TRUE );
/*N*/ if (pDest && pDest->IsDoSize())
-/*N*/ {
/*N*/ pDest->GetArea( aOldQuery );
-/*N*/ bQuerySize = TRUE;
-/*N*/ }
/*N*/ }
/*N*/
/*N*/ USHORT nTab;
@@ -223,8 +219,6 @@ namespace binfilter {
/*N*/ pDBData->GetArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow );
/*N*/
/*N*/ ScDocument* pUndoDoc = NULL;
-/*N*/ ScRangeName* pUndoRange = NULL;
-/*N*/ ScDBCollection* pUndoDB = NULL;
/*N*/
/*N*/ if (bRecord)
/*N*/ {
@@ -243,14 +237,6 @@ namespace binfilter {
/*N*/
/*N*/ // alle Formeln wegen Referenzen
/*N*/ pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTabCount-1, IDF_FORMULA, FALSE, pUndoDoc );
-/*N*/
-/*N*/ // DB- und andere Bereiche
-/*N*/ ScRangeName* pDocRange = pDoc->GetRangeName();
-/*N*/ if (pDocRange->GetCount())
-/*N*/ pUndoRange = new ScRangeName( *pDocRange );
-/*N*/ ScDBCollection* pDocDB = pDoc->GetDBCollection();
-/*N*/ if (pDocDB->GetCount())
-/*N*/ pUndoDB = new ScDBCollection( *pDocDB );
/*N*/ }
/*N*/
/*N*/ if (bSort && bSubTotal)
@@ -757,8 +743,6 @@ namespace binfilter {
/*N*/
/*N*/ ScSubTotalParam aNewParam( rParam ); // Bereichsende wird veraendert
/*N*/ ScDocument* pUndoDoc = NULL;
-/*N*/ ScRangeName* pUndoRange = NULL;
-/*N*/ ScDBCollection* pUndoDB = NULL;
/*N*/ USHORT nTabCount = 0; // fuer Referenz-Undo
/*N*/
/*N*/ if (bRecord) // alte Daten sichern
@@ -782,14 +766,6 @@ namespace binfilter {
/*N*/ // alle Formeln wegen Referenzen
/*N*/ pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTabCount-1,
/*N*/ IDF_FORMULA, FALSE, pUndoDoc );
-/*N*/
-/*N*/ // DB- und andere Bereiche
-/*N*/ ScRangeName* pDocRange = pDoc->GetRangeName();
-/*N*/ if (pDocRange->GetCount())
-/*N*/ pUndoRange = new ScRangeName( *pDocRange );
-/*N*/ ScDBCollection* pDocDB = pDoc->GetDBCollection();
-/*N*/ if (pDocDB->GetCount())
-/*N*/ pUndoDB = new ScDBCollection( *pDocDB );
/*N*/ }
/*N*/
/*N*/ ScOutlineTable* pOut = pDoc->GetOutlineTable( nTab );
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
index c5e6fcb..eee5b2b 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
@@ -324,7 +324,7 @@ using namespace ::com::sun::star;
//------------------------------------------------------------------------
/*N*/ BOOL ScDocFunc::DeleteContents( const ScMarkData& rMark, USHORT nFlags,
-/*N*/ BOOL bRecord, BOOL bApi )
+/*N*/ BOOL /*bRecord*/, BOOL bApi )
/*N*/ {
/*N*/ ScDocShellModificator aModificator( rDocShell );
/*N*/
@@ -336,8 +336,6 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ ScDocument* pDoc = rDocShell.GetDocument();
/*N*/
-/*N*/ bRecord = FALSE;
-/*N*/
/*N*/ ScEditableTester aTester( pDoc, rMark );
/*N*/ if (!aTester.IsEditable())
/*N*/ {
@@ -352,7 +350,6 @@ using namespace ::com::sun::star;
/*N*/ ScMarkData aMultiMark = rMark;
/*N*/ aMultiMark.SetMarking(FALSE); // fuer MarkToMulti
/*N*/
-/*N*/ BOOL bMulti = !bSimple && aMultiMark.IsMultiMarked();
/*N*/ if (!bSimple)
/*N*/ {
/*N*/ aMultiMark.MarkToMulti();
@@ -360,10 +357,7 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/ ScRange aExtendedRange(aMarkRange);
/*N*/ if (!bSimple)
-/*N*/ {
-/*N*/ if ( pDoc->ExtendMerge( aExtendedRange, TRUE ) )
-/*N*/ bMulti = FALSE;
-/*N*/ }
+/*N*/ pDoc->ExtendMerge( aExtendedRange, TRUE );
/*N*/
/*N*/ // keine Objekte auf geschuetzten Tabellen
/*N*/ BOOL bObjects = FALSE;
@@ -715,10 +709,9 @@ using namespace ::com::sun::star;
//------------------------------------------------------------------------
/*N*/ BOOL ScDocFunc::ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& rPattern,
-/*N*/ BOOL bRecord, BOOL bApi )
+/*N*/ BOOL /*bRecord*/, BOOL bApi )
/*N*/ {
/*N*/ ScDocument* pDoc = rDocShell.GetDocument();
-/*N*/ bRecord = FALSE;
/*N*/
/*N*/ // nur wegen Matrix nicht editierbar? Attribute trotzdem ok
/*N*/ BOOL bOnlyNotBecauseOfMatrix;
@@ -761,10 +754,9 @@ using namespace ::com::sun::star;
/*N*/ BOOL ScDocFunc::ApplyStyle( const ScMarkData& rMark, const String& rStyleName,
-/*N*/ BOOL bRecord, BOOL bApi )
+/*N*/ BOOL /*bRecord*/, BOOL bApi )
/*N*/ {
/*N*/ ScDocument* pDoc = rDocShell.GetDocument();
-/*N*/ bRecord = FALSE;
/*N*/
/*N*/ // nur wegen Matrix nicht editierbar? Attribute trotzdem ok
/*N*/ BOOL bOnlyNotBecauseOfMatrix;
@@ -805,7 +797,7 @@ using namespace ::com::sun::star;
//------------------------------------------------------------------------
-/*N*/ BOOL ScDocFunc::InsertTable( USHORT nTab, const String& rName, BOOL bRecord, BOOL bApi )
+/*N*/ BOOL ScDocFunc::InsertTable( USHORT nTab, const String& rName, BOOL /*bRecord*/, BOOL bApi )
/*N*/ {
/*N*/ BOOL bSuccess = FALSE;
/*N*/ WaitObject aWait( rDocShell.GetDialogParent() );
@@ -813,7 +805,6 @@ using namespace ::com::sun::star;
/*N*/ ScDocShellModificator aModificator( rDocShell );
/*N*/
/*N*/ ScDocument* pDoc = rDocShell.GetDocument();
-/*N*/ bRecord = FALSE;
/*N*/
/*N*/ USHORT nTabCount = pDoc->GetTableCount();
/*N*/ BOOL bAppend = ( nTab >= nTabCount );
@@ -882,10 +873,9 @@ using namespace ::com::sun::star;
/*N*/ return TRUE;
/*N*/ }
-/*N*/ BOOL ScDocFunc::RenameTable( USHORT nTab, const String& rName, BOOL bRecord, BOOL bApi )
+/*N*/ BOOL ScDocFunc::RenameTable( USHORT nTab, const String& rName, BOOL /*bRecord*/, BOOL bApi )
/*N*/ {
/*N*/ ScDocument* pDoc = rDocShell.GetDocument();
-/*N*/ bRecord = FALSE;
/*N*/ if ( !pDoc->IsDocEditable() )
/*N*/ {
/*?*/ if (!bApi)
@@ -935,13 +925,12 @@ using namespace ::com::sun::star;
/*N*/ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, USHORT nRangeCnt, USHORT* pRanges, USHORT nTab,
/*N*/ ScSizeMode eMode, USHORT nSizeTwips,
-/*N*/ BOOL bRecord, BOOL bApi )
+/*N*/ BOOL /*bRecord*/, BOOL bApi )
/*N*/ {
/*N*/ if (!nRangeCnt)
/*N*/ return TRUE;
/*N*/
/*N*/ ScDocument* pDoc = rDocShell.GetDocument();
-/*N*/ bRecord = FALSE;
/*N*/
/*N*/ if ( !rDocShell.IsEditable() )
/*N*/ {
@@ -1057,12 +1046,11 @@ using namespace ::com::sun::star;
/*N*/ BOOL ScDocFunc::RemovePageBreak( BOOL bColumn, const ScAddress& rPos,
-/*N*/ BOOL bRecord, BOOL bSetModified )
+/*N*/ BOOL /*bRecord*/, BOOL bSetModified )
/*N*/ {
/*N*/ ScDocShellModificator aModificator( rDocShell );
/*N*/
/*N*/ ScDocument* pDoc = rDocShell.GetDocument();
-/*N*/ bRecord = FALSE;
/*N*/ USHORT nTab = rPos.Tab();
/*N*/
/*N*/ USHORT nPos = bColumn ? rPos.Col() : rPos.Row();
@@ -1229,7 +1217,7 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/ BOOL ScDocFunc::AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark,
-/*N*/ USHORT nFormatNo, BOOL bRecord, BOOL bApi )
+/*N*/ USHORT nFormatNo, BOOL /*bRecord*/, BOOL bApi )
/*N*/ {
/*N*/ ScDocShellModificator aModificator( rDocShell );
/*N*/
@@ -1242,7 +1230,6 @@ using namespace ::com::sun::star;
/*N*/ USHORT nEndRow = rRange.aEnd.Row();
/*N*/ USHORT nEndTab = rRange.aEnd.Tab();
/*N*/
-/*N*/ bRecord = FALSE;
/*N*/ ScMarkData aMark;
/*N*/ if (pTabMark)
/*N*/ aMark = *pTabMark;
@@ -1372,7 +1359,7 @@ using namespace ::com::sun::star;
/*N*/ return DIR_LEFT;
/*N*/ }
-/*N*/ BOOL ScDocFunc::MergeCells( const ScRange& rRange, BOOL bContents, BOOL bRecord, BOOL bApi )
+/*N*/ BOOL ScDocFunc::MergeCells( const ScRange& rRange, BOOL bContents, BOOL /*bRecord*/, BOOL bApi )
/*N*/ {
/*N*/ ScDocShellModificator aModificator( rDocShell );
/*N*/
@@ -1383,8 +1370,6 @@ using namespace ::com::sun::star;
/*N*/ USHORT nEndRow = rRange.aEnd.Row();
/*N*/ USHORT nTab = rRange.aStart.Tab();
/*N*/
-/*N*/ bRecord = FALSE;
-/*N*/
/*N*/ ScEditableTester aTester( pDoc, nTab, nStartCol, nStartRow, nEndCol, nEndRow );
/*N*/ if (!aTester.IsEditable())
/*N*/ {
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_filtuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_filtuno.cxx
index 63f7381..849dfad 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_filtuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_filtuno.cxx
@@ -145,11 +145,6 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException)
INetURLObject aURL( aFileName );
String aExt = aURL.getExtension();
String aPrivDatName = aURL.getName();
- sal_Unicode cAsciiDel;
- if (aExt.EqualsIgnoreCaseAscii("CSV"))
- cAsciiDel = ',';
- else
- cAsciiDel = '\t';
SvStream* pInStream = NULL;
if ( xInputStream.is() )
@@ -160,10 +155,6 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException)
}
else
{
- sal_Bool bMultiByte = sal_True;
- sal_Bool bDBEnc = sal_False;
- sal_Bool bAscii = sal_False;
-
sal_Unicode cStrDel = '"';
sal_Unicode cAsciiDel = ';';
rtl_TextEncoding eEncoding = RTL_TEXTENCODING_DONTKNOW;
@@ -182,7 +173,6 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException)
cAsciiDel = '\t';
aTitle = ScGlobal::GetRscString( STR_EXPORT_ASCII );
- bAscii = sal_True;
}
else if ( aFilterString == ScDocShell::GetLotusFilterName() )
{
@@ -206,8 +196,6 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException)
}
// common for dBase import/export
eEncoding = RTL_TEXTENCODING_IBM_850;
- bMultiByte = sal_False;
- bDBEnc = sal_True;
}
else if ( aFilterString == ScDocShell::GetDifFilterName() )
{
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx
index db81325..6a14e75 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx
@@ -111,7 +111,7 @@ using namespace ::com::sun::star::beans;
//--------------------------------------------------------------------
-/*N*/ void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool bSynchron )
+/*N*/ void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool /*bSynchron*/ )
/*N*/ {
/*N*/ DBG_ASSERT(pAppData_Impl->pEventConfig,"Keine Events angemeldet!");
/*N*/
@@ -120,9 +120,6 @@ using namespace ::com::sun::star::beans;
/*N*/ {
/*N*/ if ( pDoc->IsPreview() )
/*N*/ return;
-/*N*/ SFX_ITEMSET_ARG( pDoc->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_HIDDEN, sal_False );
-/*N*/ if ( pItem && pItem->GetValue() )
-/*N*/ bSynchron = TRUE;
/*N*/ }
/*N*/
/*N*/ {
diff --git a/binfilter/bf_so3/source/persist/persist.cxx b/binfilter/bf_so3/source/persist/persist.cxx
index 994b5ad..60eac3d 100644
--- a/binfilter/bf_so3/source/persist/persist.cxx
+++ b/binfilter/bf_so3/source/persist/persist.cxx
@@ -560,13 +560,11 @@ BOOL SvPersist::Insert( SvInfoObject * pInfoObj )
DBG_ASSERT( pInfoObj->GetObjName().Len(),
"Try to Insert Object without name" );
- BOOL bRet = TRUE;
+
if( !GetInfoList() )
return FALSE; // es konnte keine Liste erstellt werden
SvPersist * pChild = pInfoObj->GetPersist();
- if( pChild && this == pChild->pParent )
- bRet = FALSE;
if( pChild )
{
diff --git a/filter/source/graphicfilter/icgm/class1.cxx b/filter/source/graphicfilter/icgm/class1.cxx
index 110d0b4..6e8e489 100644
--- a/filter/source/graphicfilter/icgm/class1.cxx
+++ b/filter/source/graphicfilter/icgm/class1.cxx
@@ -181,7 +181,7 @@ void CGM::ImplDoClass1()
{
memcpy( pBuf, mpSource, mnElementSize );
maDefRepList.Insert( pBuf, LIST_APPEND );
- maDefRepSizeList.Insert( (void*)mnElementSize, LIST_APPEND );
+ maDefRepSizeList.Insert( (void*)(sal_uIntPtr)mnElementSize, LIST_APPEND );
}
}
mnParaSize = mnElementSize;
commit e8b185043beca8c70f8f2c6f07a41f42f48745b3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 29 13:19:42 2011 +0000
equalsAscii -> equalsAsciiL
diff --git a/oox/inc/oox/ole/axcontrol.hxx b/oox/inc/oox/ole/axcontrol.hxx
index dd9a83c..8f532b3 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 8d787cf..5c99614 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 36cc2d7..d84a7a2 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 7e52001..db2443f 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 26b4389..185403e 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 4a42f70..1630b78 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 ) );
}
}
More information about the Libreoffice-commits
mailing list