1 --- oo/sw/source/filter/xml/xmltexti.cxx.orig Sat May 24 14:38:53 2003
2 +++ oo/sw/source/filter/xml/xmltexti.cxx Sat May 24 14:39:29 2003
10 - * last change: $Author$ $Date$
11 + * last change: $Author$ $Date$
13 * The Contents of this file are made available subject to the terms of
14 * either of the following licenses
16 void SwXMLTextImportHelper::RedlineAdjustStartNodeCursor(
19 - OUString& rId = GetOpenRedlineId();
20 + const OUString& rId = GetOpenRedlineId();
21 if ((NULL != pRedlineHelper) && (rId.getLength() > 0))
23 Reference<XTextRange> xTextRange( GetCursor()->getStart() );
24 --- oo/sw/source/ui/dbui/dbtree.cxx.orig Sat May 24 15:32:41 2003
25 +++ oo/sw/source/ui/dbui/dbtree.cxx Sat May 24 15:33:01 2003
33 - * last change: $Author$ $Date$
34 + * last change: $Author$ $Date$
36 * The Contents of this file are made available subject to the terms of
37 * either of the following licenses
39 const OUString* pDBNames = aDBNames.getConstArray();
40 long nCount = aDBNames.getLength();
42 - Image& rImg = aImageList.GetImage(IMG_DB);
43 - Image& rHCImg = aImageListHC.GetImage(IMG_DB);
44 + const Image& rImg = aImageList.GetImage(IMG_DB);
45 + const Image& rHCImg = aImageListHC.GetImage(IMG_DB);
46 for(long i = 0; i < nCount; i++)
48 String sDBName(pDBNames[i]);
51 long nCount = aTblNames.getLength();
52 const OUString* pTblNames = aTblNames.getConstArray();
53 - Image& rImg = aImageList.GetImage(IMG_DBTABLE);
54 - Image& rHCImg = aImageListHC.GetImage(IMG_DBTABLE);
55 + const Image& rImg = aImageList.GetImage(IMG_DBTABLE);
56 + const Image& rHCImg = aImageListHC.GetImage(IMG_DBTABLE);
57 for (long i = 0; i < nCount; i++)
59 sTableName = pTblNames[i];
62 long nCount = aQueryNames.getLength();
63 const OUString* pQueryNames = aQueryNames.getConstArray();
64 - Image& rImg = aImageList.GetImage(IMG_DBQUERY);
65 - Image& rHCImg = aImageListHC.GetImage(IMG_DBQUERY);
66 + const Image& rImg = aImageList.GetImage(IMG_DBQUERY);
67 + const Image& rHCImg = aImageListHC.GetImage(IMG_DBQUERY);
68 for (long i = 0; i < nCount; i++)
70 sQueryName = pQueryNames[i];
71 --- oo/sw/source/ui/uno/SwXDocumentSettings.cxx.orig Sat May 24 16:01:31 2003
72 +++ oo/sw/source/ui/uno/SwXDocumentSettings.cxx Sat May 24 16:03:07 2003
80 - * last change: $Author$ $Date$
81 + * last change: $Author$ $Date$
83 * The Contents of this file are made available subject to the terms of
84 * either of the following licenses
87 case HANDLE_CURRENT_DATABASE_DATA_SOURCE:
89 - SwDBData& rData = mpDoc->GetDBData();
90 + const SwDBData& rData = mpDoc->GetDBData();
91 if ( rValue >>= rData.sDataSource )
92 mpDoc->ChgDBData( rData );
95 case HANDLE_CURRENT_DATABASE_COMMAND:
97 - SwDBData& rData = mpDoc->GetDBData();
98 + const SwDBData& rData = mpDoc->GetDBData();
99 if ( rValue >>= rData.sCommand )
100 mpDoc->ChgDBData( rData );
103 case HANDLE_CURRENT_DATABASE_COMMAND_TYPE:
105 - SwDBData& rData = mpDoc->GetDBData();
106 + const SwDBData& rData = mpDoc->GetDBData();
107 if ( rValue >>= rData.nCommandType )
108 mpDoc->ChgDBData( rData );
110 --- oo/sw/source/ui/shells/basesh.cxx.orig Sat May 24 16:53:00 2003
111 +++ oo/sw/source/ui/shells/basesh.cxx Sat May 24 16:53:28 2003
119 - * last change: $Author$ $Date$
120 + * last change: $Author$ $Date$
122 * The Contents of this file are made available subject to the terms of
123 * either of the following licenses
128 - Reference < XModel > & xModel = GetView().GetDocShell()->GetModel();
129 + const Reference < XModel > & xModel = GetView().GetDocShell()->GetModel();
130 Reference < XUnoTunnel > xDocTunnel ( xModel, UNO_QUERY );
131 SwXTextDocument *pDoc = reinterpret_cast < SwXTextDocument * > ( xDocTunnel->getSomething ( SwXTextDocument::getUnoTunnelId() ) );
132 pDoc->notifyRefreshListeners();
133 --- oo/sw/source/ui/fldui/changedb.cxx.orig Sat May 24 17:13:49 2003
134 +++ oo/sw/source/ui/fldui/changedb.cxx Sat May 24 17:14:22 2003
142 - * last change: $Author$ $Date$
143 + * last change: $Author$ $Date$
145 * The Contents of this file are made available subject to the terms of
146 * either of the following licenses
147 @@ -258,14 +258,14 @@
151 - Image& rTableImg = aImageList.GetImage(IMG_DBTABLE);
152 - Image& rDBImg = aImageList.GetImage(IMG_DB);
153 - Image& rQueryImg = aImageList.GetImage(IMG_DBQUERY);
154 - Image& rHCTableImg = aImageListHC.GetImage(IMG_DBTABLE);
155 - Image& rHCDBImg = aImageListHC.GetImage(IMG_DB);
156 - Image& rHCQueryImg = aImageListHC.GetImage(IMG_DBQUERY);
157 - Image& rToInsert = nCommandType ? rQueryImg : rTableImg;
158 - Image& rHCToInsert = nCommandType ? rHCQueryImg : rHCTableImg;
159 + const Image& rTableImg = aImageList.GetImage(IMG_DBTABLE);
160 + const Image& rDBImg = aImageList.GetImage(IMG_DB);
161 + const Image& rQueryImg = aImageList.GetImage(IMG_DBQUERY);
162 + const Image& rHCTableImg = aImageListHC.GetImage(IMG_DBTABLE);
163 + const Image& rHCDBImg = aImageListHC.GetImage(IMG_DB);
164 + const Image& rHCQueryImg = aImageListHC.GetImage(IMG_DBQUERY);
165 + const Image& rToInsert = nCommandType ? rQueryImg : rTableImg;
166 + const Image& rHCToInsert = nCommandType ? rHCQueryImg : rHCTableImg;
167 while ((pParent = aUsedDBTLB.GetEntry(nParent++)) != NULL)
169 if (sDBName == aUsedDBTLB.GetEntryText(pParent))