[packages/libreoffice.git] / openoffice-sw.patch

--- oo/sw/source/filter/xml/xmltexti.cxx.orig	Sat May 24 14:38:53 2003
+++ oo/sw/source/filter/xml/xmltexti.cxx	Sat May 24 14:39:29 2003
@@ -2,9 +2,9 @@
  *
  *  $RCSfile$
  *
- *  $Revision$
+ *  $Revision$
  *
- *  last change: $Author$ $Date$
+ *  last change: $Author$ $Date$
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -827,7 +827,7 @@
 void SwXMLTextImportHelper::RedlineAdjustStartNodeCursor(
 	sal_Bool bStart)
 {
-	OUString& rId = GetOpenRedlineId();
+	const OUString& rId = GetOpenRedlineId();
 	if ((NULL != pRedlineHelper) && (rId.getLength() > 0))
 	{
         Reference<XTextRange> xTextRange( GetCursor()->getStart() ); 
--- oo/sw/source/ui/dbui/dbtree.cxx.orig	Sat May 24 15:32:41 2003
+++ oo/sw/source/ui/dbui/dbtree.cxx	Sat May 24 15:33:01 2003
@@ -2,9 +2,9 @@
  *
  *  $RCSfile$
  *
- *  $Revision$
+ *  $Revision$
  *
- *  last change: $Author$ $Date$
+ *  last change: $Author$ $Date$
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -349,8 +349,8 @@
 	const OUString* pDBNames = aDBNames.getConstArray();
 	long nCount = aDBNames.getLength();
 
-    Image& rImg = aImageList.GetImage(IMG_DB);
-    Image& rHCImg = aImageListHC.GetImage(IMG_DB);
+    const Image& rImg = aImageList.GetImage(IMG_DB);
+    const Image& rHCImg = aImageListHC.GetImage(IMG_DB);
     for(long i = 0; i < nCount; i++)
 	{
 		String sDBName(pDBNames[i]);
@@ -499,8 +499,8 @@
                         String sTableName;
                         long nCount = aTblNames.getLength();
                         const OUString* pTblNames = aTblNames.getConstArray();
-                        Image& rImg = aImageList.GetImage(IMG_DBTABLE);
-                        Image& rHCImg = aImageListHC.GetImage(IMG_DBTABLE);
+                        const Image& rImg = aImageList.GetImage(IMG_DBTABLE);
+                        const Image& rHCImg = aImageListHC.GetImage(IMG_DBTABLE);
                         for (long i = 0; i < nCount; i++)
                         {
                             sTableName = pTblNames[i];
@@ -520,8 +520,8 @@
                         String sQueryName;
                         long nCount = aQueryNames.getLength();
                         const OUString* pQueryNames = aQueryNames.getConstArray();
-                        Image& rImg = aImageList.GetImage(IMG_DBQUERY);
-                        Image& rHCImg = aImageListHC.GetImage(IMG_DBQUERY);
+                        const Image& rImg = aImageList.GetImage(IMG_DBQUERY);
+                        const Image& rHCImg = aImageListHC.GetImage(IMG_DBQUERY);
                         for (long i = 0; i < nCount; i++)
                         {
                             sQueryName = pQueryNames[i];
--- oo/sw/source/ui/uno/SwXDocumentSettings.cxx.orig	Sat May 24 16:01:31 2003
+++ oo/sw/source/ui/uno/SwXDocumentSettings.cxx	Sat May 24 16:03:07 2003
@@ -2,9 +2,9 @@
  *
  *  $RCSfile$
  *
- *  $Revision$
+ *  $Revision$
  *
- *  last change: $Author$ $Date$
+ *  last change: $Author$ $Date$
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -471,21 +471,21 @@
 		break;
 		case HANDLE_CURRENT_DATABASE_DATA_SOURCE:
 		{
-			SwDBData& rData = mpDoc->GetDBData();
+			const SwDBData& rData = mpDoc->GetDBData();
 			if ( rValue >>= rData.sDataSource )
 				mpDoc->ChgDBData( rData );
 		}
 		break;
 		case HANDLE_CURRENT_DATABASE_COMMAND:
 		{
-			SwDBData& rData = mpDoc->GetDBData();
+			const SwDBData& rData = mpDoc->GetDBData();
 			if ( rValue >>= rData.sCommand )
 				mpDoc->ChgDBData( rData );
 		}
 		break;
 		case HANDLE_CURRENT_DATABASE_COMMAND_TYPE:
 		{
-			SwDBData& rData = mpDoc->GetDBData();
+			const SwDBData& rData = mpDoc->GetDBData();
 			if ( rValue >>= rData.nCommandType )
 				mpDoc->ChgDBData( rData );
 		}
--- oo/sw/source/ui/shells/basesh.cxx.orig	Sat May 24 16:53:00 2003
+++ oo/sw/source/ui/shells/basesh.cxx	Sat May 24 16:53:28 2003
@@ -2,9 +2,9 @@
  *
  *  $RCSfile$
  *
- *  $Revision$
+ *  $Revision$
  *
- *  last change: $Author$ $Date$
+ *  last change: $Author$ $Date$
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -752,7 +752,7 @@
 	{
 		case FN_REPAGINATE:
 			{
-				Reference < XModel > & xModel = GetView().GetDocShell()->GetModel();
+				const Reference < XModel > & xModel = GetView().GetDocShell()->GetModel();
 				Reference < XUnoTunnel > xDocTunnel ( xModel, UNO_QUERY );
 				SwXTextDocument *pDoc = reinterpret_cast < SwXTextDocument * > ( xDocTunnel->getSomething ( SwXTextDocument::getUnoTunnelId() ) );
 				pDoc->notifyRefreshListeners();
--- oo/sw/source/ui/fldui/changedb.cxx.orig	Sat May 24 17:13:49 2003
+++ oo/sw/source/ui/fldui/changedb.cxx	Sat May 24 17:14:22 2003
@@ -2,9 +2,9 @@
  *
  *  $RCSfile$
  *
- *  $Revision$
+ *  $Revision$
  *
- *  last change: $Author$ $Date$
+ *  last change: $Author$ $Date$
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -258,14 +258,14 @@
 	USHORT nParent = 0;
 	USHORT nChild = 0;
 
-    Image& rTableImg = aImageList.GetImage(IMG_DBTABLE);
-    Image& rDBImg = aImageList.GetImage(IMG_DB);
-    Image& rQueryImg = aImageList.GetImage(IMG_DBQUERY);
-    Image& rHCTableImg = aImageListHC.GetImage(IMG_DBTABLE);
-    Image& rHCDBImg = aImageListHC.GetImage(IMG_DB);
-    Image& rHCQueryImg = aImageListHC.GetImage(IMG_DBQUERY);
-    Image& rToInsert = nCommandType ? rQueryImg : rTableImg;
-    Image& rHCToInsert = nCommandType ? rHCQueryImg : rHCTableImg;
+    const Image& rTableImg = aImageList.GetImage(IMG_DBTABLE);
+    const Image& rDBImg = aImageList.GetImage(IMG_DB);
+    const Image& rQueryImg = aImageList.GetImage(IMG_DBQUERY);
+    const Image& rHCTableImg = aImageListHC.GetImage(IMG_DBTABLE);
+    const Image& rHCDBImg = aImageListHC.GetImage(IMG_DB);
+    const Image& rHCQueryImg = aImageListHC.GetImage(IMG_DBQUERY);
+    const Image& rToInsert = nCommandType ? rQueryImg : rTableImg;
+    const Image& rHCToInsert = nCommandType ? rHCQueryImg : rHCTableImg;
     while ((pParent = aUsedDBTLB.GetEntry(nParent++)) != NULL)
 	{
 		if (sDBName == aUsedDBTLB.GetEntryText(pParent))
Commit	Line	Data
1fb06a95	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
	3	@@ -2,9 +2,9 @@
	4	*
	5	* $RCSfile$
	6	*
	7	- * $Revision$
	8	+ * $Revision$
	9	*
	10	- * last change: $Author$ $Date$
	11	+ * last change: $Author$ $Date$
	12	*
	13	* The Contents of this file are made available subject to the terms of
	14	* either of the following licenses
	15	@@ -827,7 +827,7 @@
	16	void SwXMLTextImportHelper::RedlineAdjustStartNodeCursor(
	17	sal_Bool bStart)
	18	{
	19	- OUString& rId = GetOpenRedlineId();
	20	+ const OUString& rId = GetOpenRedlineId();
	21	if ((NULL != pRedlineHelper) && (rId.getLength() > 0))
	22	{
	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
	26	@@ -2,9 +2,9 @@
	27	*
	28	* $RCSfile$
	29	*
	30	- * $Revision$
	31	+ * $Revision$
	32	*
	33	- * last change: $Author$ $Date$
	34	+ * last change: $Author$ $Date$
	35	*
	36	* The Contents of this file are made available subject to the terms of
	37	* either of the following licenses
	38	@@ -349,8 +349,8 @@
	39	const OUString* pDBNames = aDBNames.getConstArray();
	40	long nCount = aDBNames.getLength();
	41
	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++)
	47	{
	48	String sDBName(pDBNames[i]);
	49	@@ -499,8 +499,8 @@
	50	String sTableName;
	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++)
	58	{
	59	sTableName = pTblNames[i];
	60	@@ -520,8 +520,8 @@
	61	String sQueryName;
	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++)
69	{
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
73	@@ -2,9 +2,9 @@
74	*
75	* $RCSfile$
76	*
77	- * $Revision$
78	+ * $Revision$
79	*
80	- * last change: $Author$ $Date$
81	+ * last change: $Author$ $Date$
82	*
83	* The Contents of this file are made available subject to the terms of
84	* either of the following licenses
85	@@ -471,21 +471,21 @@
86	break;
87	case HANDLE_CURRENT_DATABASE_DATA_SOURCE:
88	{
89	- SwDBData& rData = mpDoc->GetDBData();
90	+ const SwDBData& rData = mpDoc->GetDBData();
91	if ( rValue >>= rData.sDataSource )
92	mpDoc->ChgDBData( rData );
93	}
94	break;
95	case HANDLE_CURRENT_DATABASE_COMMAND:
96	{
97	- SwDBData& rData = mpDoc->GetDBData();
98	+ const SwDBData& rData = mpDoc->GetDBData();
99	if ( rValue >>= rData.sCommand )
100	mpDoc->ChgDBData( rData );
101	}
102	break;
103	case HANDLE_CURRENT_DATABASE_COMMAND_TYPE:
104	{
105	- SwDBData& rData = mpDoc->GetDBData();
106	+ const SwDBData& rData = mpDoc->GetDBData();
107	if ( rValue >>= rData.nCommandType )
108	mpDoc->ChgDBData( rData );
109	}
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
112	@@ -2,9 +2,9 @@
113	*
114	* $RCSfile$
115	*
116	- * $Revision$
117	+ * $Revision$
118	*
119	- * last change: $Author$ $Date$
120	+ * last change: $Author$ $Date$
121	*
122	* The Contents of this file are made available subject to the terms of
123	* either of the following licenses
124	@@ -752,7 +752,7 @@
125	{
126	case FN_REPAGINATE:
127	{
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
135	@@ -2,9 +2,9 @@
136	*
137	* $RCSfile$
138	*
139	- * $Revision$
140	+ * $Revision$
141	*
142	- * last change: $Author$ $Date$
143	+ * last change: $Author$ $Date$
144	*
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 @@
148	USHORT nParent = 0;
149	USHORT nChild = 0;
150
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)
168	{
169	if (sDBName == aUsedDBTLB.GetEntryText(pParent))