The invention relates to a device for optical distance measurement, in particular a device functioning in accordance with the phase measurement principle, having at least one transmission unit (12) equipped with at least one light source (22, 24) for transmitting modulated optical measurement radiation (16) toward a target object (20), and having a reception unit (18) for receiving the optical measurement radiation (17) returning from the target object (20). According to the present invention, the device has means (51, 55, 68) that enable a measurement of distances from a target object (20′) by means of a triangulation method. The invention also relates to a method for optical distance measurement in which it is possible to switch back and forth between a phase measurement method for determining a distance of a distance measuring device from a target object (20, 20′) and a triangulation method for determining this distance.