Changeset 375 for branches


Ignore:
Timestamp:
02/03/14 17:29:36 (6 years ago)
Author:
jls17
Message:
Location:
branches/work_304/doc
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/work_304/doc/DocActionSetFieldsHelper.cpp

    r374 r375  
    3838} 
    3939 
    40 void CDocActionSetFieldsHelper::SetFieldsGetSecondaryForm(stringstream &strmSchema, stringstream &strmSchemaDisplay, stringstream &strmServer, stringstream &strmQual) 
    41 { 
     40void CDocActionSetFieldsHelper::SetFieldsGetSecondaryForm(std::ostream &writer) 
     41{ 
     42        stringstream strmSchema; 
     43        stringstream strmSchemaDisplay; 
     44        stringstream strmServer; 
     45        stringstream strmQual; 
     46 
    4247        bool useDefaultFieldMappingTable = true; 
    4348 
  • branches/work_304/doc/DocActionSetFieldsHelper.h

    r374 r375  
    2626        ~CDocActionSetFieldsHelper(void); 
    2727 
    28         void SetFieldsGetSecondaryForm(stringstream &strmSchema, stringstream &strmSchemaDisplay, stringstream &strmServer, stringstream &strmQual); 
     28        void SetFieldsGetSecondaryForm(std::ostream &writer); 
    2929        void ShowActionWithServerName(bool showIt); 
    3030 
  • branches/work_304/doc/DocAlActionStruct.cpp

    r374 r375  
    262262                CDocActionSetFieldsHelper *alHelper = new CDocActionSetFieldsHelper(*arIn, *obj, schemaName, action, structItemType, ifElse, nAction, rootLevel); 
    263263                alHelper->ShowActionWithServerName(true); 
    264                 alHelper->SetFieldsGetSecondaryForm(secondaryFormRaw, secondaryFormDisplay, serverRaw, qualification); 
     264                alHelper->SetFieldsGetSecondaryForm(strm); 
    265265                delete alHelper; 
    266  
    267                 strm << secondaryFormDisplay.str(); 
    268266        } 
    269267        catch(exception& e) 
  • branches/work_304/doc/DocFilterActionStruct.cpp

    r374 r375  
    351351 
    352352                CDocActionSetFieldsHelper* filterHelper = new CDocActionSetFieldsHelper(*arIn, *obj, schemaName, action, structItemType, ifElse, nAction, rootLevel); 
    353                 filterHelper->SetFieldsGetSecondaryForm(secondaryFormRaw, secondaryFormDisplay,  serverRaw, qualification); 
     353                filterHelper->SetFieldsGetSecondaryForm(strm); 
    354354                delete filterHelper; 
    355  
    356                 //For the following internal calculations we need a secondary form 
    357                 string readFromSchemaName = secondaryFormRaw.str(); 
    358  
    359                 string tmpDisplayName = secondaryFormDisplay.str(); 
    360                 if(tmpDisplayName.size()==0) 
    361                         tmpDisplayName = readFromSchemaName; 
    362  
    363                 else 
    364                 { 
    365                         strm << tmpDisplayName; 
    366                 } 
    367355        } 
    368356        catch(exception& e) 
Note: See TracChangeset for help on using the changeset viewer.