incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mba...@apache.org
Subject svn commit: r1172371 - /incubator/ooo/trunk/main/sfx2/source/appl/appuno.cxx
Date Sun, 18 Sep 2011 21:32:24 GMT
Author: mbauer
Date: Sun Sep 18 21:32:24 2011
New Revision: 1172371

URL: http://svn.apache.org/viewvc?rev=1172371&view=rev
Log:
cws mba34issues01: #i114600#: fix compiler warning for name clash found on Solaris

Modified:
    incubator/ooo/trunk/main/sfx2/source/appl/appuno.cxx

Modified: incubator/ooo/trunk/main/sfx2/source/appl/appuno.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sfx2/source/appl/appuno.cxx?rev=1172371&r1=1172370&r2=1172371&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sfx2/source/appl/appuno.cxx (original)
+++ incubator/ooo/trunk/main/sfx2/source/appl/appuno.cxx Sun Sep 18 21:32:24 2011
@@ -141,7 +141,7 @@ using namespace ::com::sun::star::io;
 #include <sfxslots.hxx>
 
 // needs to be converted to a better data structure
-SfxFormalArgument aArgs[] = 
+SfxFormalArgument aFormalArgs[] = 
 {
     SFX_ARGUMENT(SID_DEFAULTFILENAME,"SuggestedSaveAsName",SfxStringItem),
     SFX_ARGUMENT(SID_DEFAULTFILEPATH,"SuggestedSaveAsDir",SfxStringItem),
@@ -165,7 +165,7 @@ SfxFormalArgument aArgs[] = 
     SFX_ARGUMENT(SID_VERSION,"Version",SfxInt16Item),
 };
 
-static sal_uInt16 nMediaArgsCount = sizeof(aArgs) / sizeof (SfxFormalArgument);
+static sal_uInt16 nMediaArgsCount = sizeof(aFormalArgs) / sizeof (SfxFormalArgument);
 
 static char const sTemplateRegionName[] = "TemplateRegionName";
 static char const sTemplateName[] = "TemplateName";
@@ -367,7 +367,7 @@ void TransformParameters( sal_uInt16 nSl
 		sal_uInt16 nMaxArgs = bIsMediaDescriptor ? nMediaArgsCount : pSlot->nArgDefCount;
         for ( sal_uInt16 nArgs=0; nArgs<nMaxArgs; nArgs++ )
         {
-			const SfxFormalArgument &rArg = bIsMediaDescriptor ? aArgs[nArgs] : pSlot->GetFormalArgument(
nArgs );
+			const SfxFormalArgument &rArg = bIsMediaDescriptor ? aFormalArgs[nArgs] : pSlot->GetFormalArgument(
nArgs );
             SfxPoolItem* pItem = rArg.CreateItem();
             if ( !pItem )
             {
@@ -1168,7 +1168,7 @@ void TransformItems( sal_uInt16 nSlotId,
                 sal_uInt16 nArg;
                 for ( nArg=0; nArg<nFormalArgs; ++nArg )
                 {
-					const SfxFormalArgument &rArg = bIsMediaDescriptor ? aArgs[nArg] : pSlot->GetFormalArgument(
nArg );
+					const SfxFormalArgument &rArg = bIsMediaDescriptor ? aFormalArgs[nArg] : pSlot->GetFormalArgument(
nArg );
                     sal_uInt16 nWhich = rSet.GetPool()->GetWhich( rArg.nSlotId );
                     if ( nId == nWhich )
                         break;



Mime
View raw message