sw: Prefix SwInsertFld_Data member variables.

Change-Id: I2c07a57e60f8eaf1b9d570f4d42dd2955574a85b

sw/source/ui/fldui/fldpage.cxx

@@ -127,7 +127,7 @@ bool SwFldPage::InsertFld(sal_uInt16 nTypeId, sal_uInt16 nSubType, const OUStrin
     {
         SwInsertFld_Data aData(nTypeId, nSubType, rPar1, rPar2, nFormatId, 0, cSeparator, bIsAutomaticLanguage );
         //#i26566# provide parent for SwWrtShell::StartInputFldDlg
-        aData.pParent = &GetTabDialog()->GetOKButton();
+        aData.m_pParent = &GetTabDialog()->GetOKButton();
         bRet = m_aMgr.InsertFld( aData );
 
         uno::Reference< frame::XDispatchRecorder > xRecorder =

sw/source/uibase/inc/fldmgr.hxx

@@ -65,36 +65,35 @@ struct SwFldGroupRgn
 // with command strings
 struct SwInsertFld_Data
 {
-    sal_uInt16 nTypeId;
-    sal_uInt16 nSubType;
-    const OUString sPar1;
-    const OUString sPar2;
-    sal_uLong nFormatId;
-    SwWrtShell* pSh;
-    sal_Unicode cSeparator;
-    bool bIsAutomaticLanguage;
-    ::com::sun::star::uno::Any aDBDataSource;
-    ::com::sun::star::uno::Any aDBConnection;
-    ::com::sun::star::uno::Any aDBColumn;
-    VclPtr<vcl::Window> pParent; // parent dialog used for SwWrtShell::StartInputFldDlg()
+    sal_uInt16 m_nTypeId;
+    sal_uInt16 m_nSubType;
+    const OUString m_sPar1;
+    const OUString m_sPar2;
+    sal_uLong m_nFormatId;
+    SwWrtShell* m_pSh;
+    sal_Unicode m_cSeparator;
+    bool m_bIsAutomaticLanguage;
+    ::com::sun::star::uno::Any m_aDBDataSource;
+    ::com::sun::star::uno::Any m_aDBConnection;
+    ::com::sun::star::uno::Any m_aDBColumn;
+    VclPtr<vcl::Window> m_pParent; // parent dialog used for SwWrtShell::StartInputFldDlg()
 
     SwInsertFld_Data(sal_uInt16 nType, sal_uInt16 nSub, const OUString& rPar1, const OUString& rPar2,
                     sal_uLong nFmtId, SwWrtShell* pShell = NULL, sal_Unicode cSep = ' ', bool bIsAutoLanguage = true) :
-        nTypeId(nType),
-        nSubType(nSub),
-        sPar1(rPar1),
-        sPar2(rPar2),
-        nFormatId(nFmtId),
-        pSh(pShell),
-        cSeparator(cSep),
-        bIsAutomaticLanguage(bIsAutoLanguage),
-        pParent(0) {}
+        m_nTypeId(nType),
+        m_nSubType(nSub),
+        m_sPar1(rPar1),
+        m_sPar2(rPar2),
+        m_nFormatId(nFmtId),
+        m_pSh(pShell),
+        m_cSeparator(cSep),
+        m_bIsAutomaticLanguage(bIsAutoLanguage),
+        m_pParent(0) {}
 
     SwInsertFld_Data() :
-        pSh(0),
-        cSeparator(' '),
-        bIsAutomaticLanguage(true){}
-
+        m_pSh(0),
+        m_cSeparator(' '),
+        m_bIsAutomaticLanguage(true){}
 };
 
 class SW_DLLPUBLIC SwFldMgr

sw/source/uibase/shells/textsh2.cxx

@@ -208,9 +208,9 @@ void SwTextShell::ExecDB(SfxRequest &rReq)
                 SwFldMgr aFldMgr(GetShellPtr());
                 SwInsertFld_Data aData(TYP_DBFLD, 0, sDBName, OUString(), 0);
                 if(pConnectionItem)
-                    aData.aDBConnection = static_cast<const SfxUsrAnyItem*>(pConnectionItem)->GetValue();
+                    aData.m_aDBConnection = static_cast<const SfxUsrAnyItem*>(pConnectionItem)->GetValue();
                 if(pColumnItem)
-                    aData.aDBColumn = static_cast<const SfxUsrAnyItem*>(pColumnItem)->GetValue();
+                    aData.m_aDBColumn = static_cast<const SfxUsrAnyItem*>(pColumnItem)->GetValue();
                 aFldMgr.InsertFld(aData);
                 SfxViewFrame* pViewFrame = GetView().GetViewFrame();
                 uno::Reference< XDispatchRecorder > xRecorder =