Commits

Anonymous committed 17f1696

#i10000#: fix wrong merge conflict resolution (CWS sb102)

Comments (0)

Files changed (1)

connectivity/source/drivers/dbase/DTable.cxx

 			aStr.EraseTrailingChars();
 
 			if ( aStr.Len() )
-                *(*(_rRow).get())[i] = ::rtl::OUString(aStr);
+                *(_rRow->get())[i] = ::rtl::OUString(aStr);
 			else// keine StringLaenge, dann NULL
-                (*(_rRow.get()))[i]->setNull();
+                (_rRow->get())[i]->setNull();
 				
 			pData[nLen] = cLast;
 		}
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.